Skip to content

Commit

Permalink
Merge pull request #44
Browse files Browse the repository at this point in the history 
ksidirop/MAN-299-migrate-to-github-actions
  • Loading branch information
@ksidirop-laerdal
ksidirop-laerdal authored Apr 15, 2024
2 parents a0ec0dc + d704305 commit 551dc26
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-actions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
build:

runs-on: 'windows-2022'
timeout-minutes: 5
timeout-minutes: 20

steps:

Expand Down
10 changes: 6 additions & 4 deletions Laerdal.Dfu/Laerdal.Dfu.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

<PropertyGroup>
<TargetFrameworks>net7.0-ios;net7.0-android</TargetFrameworks>

<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' ">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition=" $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' ">21.0</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -33,6 +34,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-ios'">
<PackageReference Include="Laerdal.Dfu.Bindings.iOS" Version="4.13.0.43890" />
<PackageReference Include="Laerdal.Dfu.Bindings.iOS" Version="4.13.0.43894" />
</ItemGroup>
</Project>

</Project>

0 comments on commit 551dc26

Please sign in to comment.