revert (Laerdal.Dfu.csproj): undo the changes of ios-mode and revert …

…the .csproj back to its traditional style
Laerdal · Jan 15, 2025 · 693b9d1 · 693b9d1
1 parent 10779af
commit 693b9d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/Laerdal.Dfu/Laerdal.Dfu.csproj b/Laerdal.Dfu/Laerdal.Dfu.csproj
@@ -11,12 +11,11 @@
     </PropertyGroup>
 
     <!-- ==================== TARGET FRAMEWORKS GROUP ===================== -->
-    <PropertyGroup>       
+    <PropertyGroup>
+        <TargetFrameworks>$(TargetFrameworks)net8.0;</TargetFrameworks>
         <TargetFrameworks>$(TargetFrameworks)net8.0-ios;</TargetFrameworks>
-
-        <TargetFrameworks Condition=" '$(iOSMode)' == 'vanilla' or '$(iOSMode)' == '' ">$(TargetFrameworks)net8.0;</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(iOSMode)' == 'vanilla' or '$(iOSMode)' == '' ">$(TargetFrameworks)net8.0-android;</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(iOSMode)' == 'vanilla' or '$(iOSMode)' == '' ">$(TargetFrameworks)net8.0-maccatalyst</TargetFrameworks>
+        <TargetFrameworks>$(TargetFrameworks)net8.0-android;</TargetFrameworks>
+        <TargetFrameworks>$(TargetFrameworks)net8.0-maccatalyst</TargetFrameworks>
     </PropertyGroup>
 
     <!-- =================== TARGET FRAMEWORK DETECTION ===================== -->
@@ -78,9 +77,6 @@
 
     <PropertyGroup>
         <Laerdal_Package_Name>Laerdal.Dfu</Laerdal_Package_Name>
-        <Laerdal_Package_Name Condition=" '$(iOSMode)' == 'simulator-x64'   ">Laerdal.Dfu.iOSSimulator.x64</Laerdal_Package_Name>
-        <Laerdal_Package_Name Condition=" '$(iOSMode)' == 'simulator-arm64' ">Laerdal.Dfu.iOSSimulator.Arm64</Laerdal_Package_Name>
-
         <Laerdal_Package_Tags>Ble;Tools;Dfu;Bluetooth;Nordic;Semiconductor;iOS;Android</Laerdal_Package_Tags>
         <Laerdal_Package_Copyright>Laerdal Medical, Francois Raminosona</Laerdal_Package_Copyright>
         <Laerdal_Package_Description>Wrapper around Nordic.Dfu</Laerdal_Package_Description>
@@ -103,17 +99,13 @@
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
         <PackageReference Include="Laerdal.Dfu.Bindings.Android" Version="2.7.0.43895"/>
     </ItemGroup>
-
     <!-- iOS -->
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
-        <PackageReference Include="Laerdal.Dfu.Bindings.iOS" Version="4.15.3.43990" Condition=" '$(iOSMode)' == '' or '$(iOSMode)' == 'vanilla' " />
-        <PackageReference Include="Laerdal.Dfu.Bindings.iOSSimulator.x64" Version="4.15.3.43990" Condition=" '$(iOSMode)' == 'simulator-x64' " />
-        <PackageReference Include="Laerdal.Dfu.Bindings.iOSSimulator.Arm64" Version="4.15.3.43990" Condition=" '$(iOSMode)' == 'simulator-arm64' " />
+        <PackageReference Include="Laerdal.Dfu.Bindings.iOS" Version="4.15.3.43995" />
     </ItemGroup>
-
     <!-- MacCatalyst -->
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-maccatalyst'">
-        <PackageReference Include="Laerdal.Dfu.Bindings.MacCatalyst" Version="4.15.3.43990" />
+        <PackageReference Include="Laerdal.Dfu.Bindings.MacCatalyst" Version="4.15.3.43995" />
     </ItemGroup>
     <!-- =========================== PACKAGES ============================ -->
 

diff --git a/Laerdal.Dfu/Laerdal.targets b/Laerdal.Dfu/Laerdal.targets
@@ -94,8 +94,6 @@
         <Message Importance="high" Text="IsForPlainNetX :         $(IsForPlainNetX)        "/>
         <Message Importance="high" Text="IsForAppleStuff :        $(IsForAppleStuff)       "/>
         <Message Importance="high" Text="IsForMacCatalyst :       $(IsForMacCatalyst)      "/>
-        <Message Importance="High" Text="                                                  "/>
-        <Message Importance="high" Text="iOSMode :                $(iOSMode)               "/>
     </Target>
 
     <!-- ==================== MAUI for .NET8 changes ==================== -->

diff --git a/Laerdal.Scripts/Laerdal.Builder.targets b/Laerdal.Scripts/Laerdal.Builder.targets
@@ -86,10 +86,6 @@
 
         <!-- RUN -->
         <MSBuild Projects="$(Laerdal_Project)" Properties="$(_Laerdal_Build_Parameters)" Targets="Restore;Build"/>
-
-        <!-- special builds for the ios-simulators -->
-        <MSBuild Projects="$(Laerdal_Project)" Properties="$(_Laerdal_Build_Parameters);iOSMode=simulator-x64" Targets="Restore;Build"/>
-        <MSBuild Projects="$(Laerdal_Project)" Properties="$(_Laerdal_Build_Parameters);iOSMode=simulator-arm64" Targets="Restore;Build"/>
     </Target>
 
     <!-- GITHUB RELEASE -->