Merge pull request #18

ksidirop/NOJIRA-upgrade-to-net8
Laerdal · May 23, 2024 · a0b866f · a0b866f
2 parents b50b7b7 + 65c9be4
commit a0b866f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/Laerdal.Dfu.Bindings.iOS/Laerdal.Dfu.Bindings.iOS.csproj b/Laerdal.Dfu.Bindings.iOS/Laerdal.Dfu.Bindings.iOS.csproj
@@ -9,19 +9,22 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TargetFramework>net7.0-ios</TargetFramework>
-
-        <MtouchExtraArgs>-v -v -v -v</MtouchExtraArgs>
-
+        <TargetFramework>net8.0-ios</TargetFramework>
         <IsBindingProject>true</IsBindingProject>
 
+        <IsOSX Condition="      '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))'     == 'true' ">true</IsOSX>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DebugType>full</DebugType>
+        <Optimized>false</Optimized>
+        <MtouchExtraArgs>-v -v -v -v</MtouchExtraArgs>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
-
-        <!-- https://github.com/Laerdal/Laerdal.Dfu/issues/29#issuecomment-1904057544 -->
         <NoBindingEmbedding>true</NoBindingEmbedding>
+        <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
 
-        <IsOSX Condition="      '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))'     == 'true' ">true</IsOSX>
+        <!-- 1. under net8 we need Optimized=false otherwise release builds cause the resulting apps to crash right upon getting launched in the iphone! -->
+        <!-- 2. NoBindingEmbedding=true per https://github.com/Laerdal/Laerdal.Dfu/issues/29#issuecomment-1904057544 -->
     </PropertyGroup>
 
     <!-- ==================== VERSION ==================== -->

diff --git a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh
@@ -76,8 +76,7 @@ dotnet                                \
              install                  \
                  maui                 \
                  ios                  \
-                 maui-ios             \
-                 wasm-tools-net7
+                 maui-ios
 #                    --from-rollback-file=https://maui.blob.core.windows.net/metadata/rollbacks/${dotnet_8_workload_version}.json   # we need to install additional packages manually
 declare exitCode=$?
 if [ $exitCode != 0 ]; then

diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.0",
+    "rollForward": "latestFeature",
+    "allowPrerelease": false
+  }
+}