From 454117a04233e7663d21a12cbba82c63f6662b91 Mon Sep 17 00:00:00 2001
From: Francois Raminosona <francois.raminosona@laerdal.com>
Date: Fri, 13 Sep 2024 11:41:33 +0200
Subject: [PATCH 1/4] Removing .net standard 2.1

---
 Laerdal.Dfu/Laerdal.Dfu.csproj                    | 15 +--------------
 .../Platforms.NetStandard/DfuInstallation.cs      | 15 ---------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 Laerdal.Dfu/Platforms.NetStandard/DfuInstallation.cs

diff --git a/Laerdal.Dfu/Laerdal.Dfu.csproj b/Laerdal.Dfu/Laerdal.Dfu.csproj
index 534bb6f..59bc72e 100644
--- a/Laerdal.Dfu/Laerdal.Dfu.csproj
+++ b/Laerdal.Dfu/Laerdal.Dfu.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <!-- todo   add support for maccatalyst -->
-        <TargetFrameworks>net8.0-ios;net8.0-android;netstandard2.1;</TargetFrameworks>
+        <TargetFrameworks>net8.0-ios;net8.0-android</TargetFrameworks>
 
         <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
@@ -33,19 +33,6 @@
     </PropertyGroup>
     <!-- ============================ VERSION ============================ -->
 
-
-    <!-- ==================== NETSTANDARD PlACEHOLDER ==================== -->
-    <ItemGroup Condition=" '$(TargetFramework.StartsWith(netstandard))' == 'true' ">
-        <Compile Remove="Platforms\**\**">
-        </Compile>
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework.StartsWith(netstandard))' != 'true' ">
-        <Compile Remove="Platforms.NetStandard\**">
-        </Compile>
-    </ItemGroup>
-    <!-- ==================== NETSTANDARD PlACEHOLDER ==================== -->
-
     <Import Project="Laerdal.targets"/>
 
     <!-- =========================== PACKAGES ============================ -->    
diff --git a/Laerdal.Dfu/Platforms.NetStandard/DfuInstallation.cs b/Laerdal.Dfu/Platforms.NetStandard/DfuInstallation.cs
deleted file mode 100644
index b4cefaa..0000000
--- a/Laerdal.Dfu/Platforms.NetStandard/DfuInstallation.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Laerdal.Dfu
-{
-    public partial class DfuInstallation
-    {
-        public DfuInstallation(string deviceId, string fileUrl)
-        {
-            throw new NotImplementedException();
-        }
-        
-        public override void Abort() => throw new NotImplementedException();
-        public override void Start() => throw new NotImplementedException();
-        public override void Pause() => throw new NotImplementedException();
-        public override void Resume() => throw new NotImplementedException();
-    }
-}

From a10e9e404c012164be04c5a4c7b479f410fda55d Mon Sep 17 00:00:00 2001
From: Francois Raminosona <francois.raminosona@laerdal.com>
Date: Fri, 13 Sep 2024 11:42:03 +0200
Subject: [PATCH 2/4] Testing automatic nuget login

---
 .github/workflows/github-actions.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index dc061d8..40d8924 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -61,8 +61,8 @@ jobs:
                 &&                                                                                               \
                      "${{env.BUILD_REPOSITORY_FOLDERPATH}}/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh"     \
                              "https://nuget.pkg.github.com/Laerdal/index.json"                                   \
-                             "${{ env.SCL_GITHUB_NUGET_FEED_USERNAME }}"                                         \
-                             "${{ env.SCL_GITHUB_ACCESS_TOKEN        }}"                                         \
+                             "${{ github.actor                       }}"                                         \
+                             "${{ github.token                       }}"                                         \
                              "${{ env.BUILD_REPOSITORY_FOLDERPATH    }}/Artifacts"
 
       # we need to manually install java11 because it is needed by the latest windows vm-images that run on

From de845583b4a0dc8702f2f706d377b412310d833b Mon Sep 17 00:00:00 2001
From: Francois Raminosona <francois.raminosona@laerdal.com>
Date: Fri, 13 Sep 2024 11:44:50 +0200
Subject: [PATCH 3/4] Building on macos

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 40d8924..5a8b09e 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -43,7 +43,7 @@ jobs:
   
   build:
 
-    runs-on: 'windows-2022'
+    runs-on: 'macos-14'
     timeout-minutes: 20
 
     steps:

From 09f9fc70cce23296d8331bc7e6b7a216f3b77eda Mon Sep 17 00:00:00 2001
From: Francois Raminosona <francois.raminosona@laerdal.com>
Date: Fri, 13 Sep 2024 11:46:42 +0200
Subject: [PATCH 4/4] Cleaning up Maui references

---
 Laerdal.Dfu/Laerdal.targets | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Laerdal.Dfu/Laerdal.targets b/Laerdal.Dfu/Laerdal.targets
index e2c1465..72ccb0c 100644
--- a/Laerdal.Dfu/Laerdal.targets
+++ b/Laerdal.Dfu/Laerdal.targets
@@ -88,6 +88,24 @@
         <Message Importance="High" Text="Version: $(Version)" />
     </Target>
 
+    <!-- ==================== MAUI for .NET8 changes ==================== -->
+    <ItemGroup>
+        <!-- Warning MA002 : Starting with .NET 8, setting  <UseMaui>true</UseMaui>  does not automatically include NuGet package references in your project.  
+        Update your project by including this item:  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />.  
+        You can skip this warning by setting  <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>  in your project file. -->
+        <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
+        <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
+        <!-- Warning MA002 : Starting with .NET 8, setting  <UseMauiEssentials>true</UseMauiEssentials>  does not automatically include NuGet package references in your project.  
+        Update your project by including this item:  <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.21" />.  
+        You can skip this warning by setting  <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>  in your project file. 
+        <PackageReference Include="Microsoft.Maui.Essentials" Version="8.0.21" />-->
+    </ItemGroup>
+
+    <PropertyGroup>
+        <UseMaui>true</UseMaui>
+        <SkipValidateMauiImplicitPackageReferences>true</SkipValidateMauiImplicitPackageReferences>
+    </PropertyGroup>
+
     <!-- ==================== VERSION ==================== -->
     <PropertyGroup>
         <Laerdal_Version_Full Condition="     '$(Laerdal_Version_Full)'     == '' ">1.0.0</Laerdal_Version_Full>