From 5636f9f10549455d3c248a3c791f71f429be0f51 Mon Sep 17 00:00:00 2001
From: Janus Weil <janus@gcc.gnu.org>
Date: Sat, 12 Oct 2024 14:06:29 +0200
Subject: [PATCH 1/2] use .NET 9 SDK

---
 .github/workflows/dotnet.yml | 4 +++-
 global.json                  | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index a5899d9..04d2777 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -19,12 +19,14 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: '11'
+    - name: Restore workloads
+      run: dotnet workload restore MauiSample/MauiSample.sln
     - name: Restore dependencies
       run: dotnet restore MauiSample/MauiSample.sln
     - name: Build Maui Lib
diff --git a/global.json b/global.json
index f70fa4e..6cc0256 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,6 @@
 {
     "sdk": {
-      "version": "8.0.100",
+      "version": "9.0.0",
       "rollForward": "latestFeature"
     }
   }
-  
\ No newline at end of file

From 5776ca417d2019650dbc3dd26426debc6bd49063 Mon Sep 17 00:00:00 2001
From: Janus Weil <janus@gcc.gnu.org>
Date: Sun, 29 Sep 2024 16:21:38 +0300
Subject: [PATCH 2/2] MauiSample: add .NET 9 target frameworks

---
 MauiSample/MauiSample.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MauiSample/MauiSample.csproj b/MauiSample/MauiSample.csproj
index 109649d..3b91a17 100644
--- a/MauiSample/MauiSample.csproj
+++ b/MauiSample/MauiSample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst;net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -31,7 +31,7 @@
 		<ProvisioningType>automatic</ProvisioningType>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(TargetFramework)'=='net8.0-ios'">
+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
 	  <CodesignKey>Apple Development: Created via API (K8Q3S2AN24)</CodesignKey>
 	  <CodesignProvision>VS: WildCard Development</CodesignProvision>
 	</PropertyGroup>