Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ksidirop/MAN-299-migrate-to-github-actions #43

Merged
merged 2 commits into from
Apr 12, 2024
Merged

ksidirop/MAN-299-migrate-to-github-actions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d94ade
upgrade (Laerdal.Dfu.csproj): Laerdal.Dfu.Bindings.Android ver 2.3.0.…
ksidirop-laerdal Apr 12, 2024
88364f8
upgrade (Laerdal.Dfu.csproj): Laerdal.Dfu.Bindings.iOS -> 4.13.0.43890
ksidirop-laerdal Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Laerdal.Dfu/Laerdal.Dfu.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@
<Import Project="Laerdal.targets"/>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
<PackageReference Include="Laerdal.Dfu.Bindings.Android" Version="2.3.0.43685"/>
<PackageReference Include="Laerdal.Dfu.Bindings.Android" Version="2.3.0.43876" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-ios'">
<PackageReference Include="Laerdal.Dfu.Bindings.iOS" Version="4.13.0.43870"/>
<PackageReference Include="Laerdal.Dfu.Bindings.iOS" Version="4.13.0.43890" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Laerdal.Dfu/Platforms/Android/Specific/DfuLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ public class DfuLogger : Java.Lang.Object, Laerdal.Dfu.Bindings.Android.IDfuLogL
public DfuLogger(string deviceAddress)
{
DeviceAddress = deviceAddress;

Laerdal.Dfu.Bindings.Android.DfuServiceListenerHelper.RegisterLogListener(Android.App.Application.Context, this);
}

protected override void Dispose(bool disposing)
{
Laerdal.Dfu.Bindings.Android.DfuServiceListenerHelper.UnregisterLogListener(Android.App.Application.Context, this);

base.Dispose(disposing);
}

Expand Down
4 changes: 0 additions & 4 deletions Laerdal.Scripts/Laerdal.Builder.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- -->
<!-- # on macos -->
<!-- dotnet msbuild "Laerdal.Scripts/Laerdal.Builder.targets" -->
<!-- -->
<!-- # on windows powershell -->
<!-- dotnet msbuild "Laerdal.Scripts\Laerdal.Builder.targets" -->
<!-- -->
<Project DefaultTargets="BuildProjects">

<PropertyGroup>
Expand Down
Loading