From 1f7890fedbacae49f6d0f79503c7ec34d8ffa6b0 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 16 Jan 2025 14:34:17 -0600
Subject: [PATCH 1/2] `net8.0` -> `net10.0`

---
 Directory.Build.props       | 10 +++++-----
 global.json                 |  5 -----
 tests/Directory.Build.props |  4 ++--
 utilities.cake              |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 639fb678d..6ffe3ba16 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -6,8 +6,8 @@
     <RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
 
     <!-- Default TFM's we build for -->
-    <_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
-    <_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
+    <_DefaultTargetFrameworks>net10.0-android</_DefaultTargetFrameworks>
+    <_DefaultNetTargetFrameworks>net10.0</_DefaultNetTargetFrameworks>
 
     <!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
@@ -78,13 +78,13 @@
 
   <!-- Folders that .targets files need to go into -->
   <ItemGroup>
-    <AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
-    <AndroidXNuGetTargetFolders Include="buildTransitive\net8.0-android34.0" />
+    <AndroidXNuGetTargetFolders Include="build\net10.0-android35.0" />
+    <AndroidXNuGetTargetFolders Include="buildTransitive\net10.0-android35.0" />
   </ItemGroup>
 
   <!-- Folders that _._ files need to go into for packages without managed libraries -->
   <ItemGroup>
-    <AndroidXNuGetLibFolders Include="lib\net8.0-android34.0" />
+    <AndroidXNuGetLibFolders Include="lib\net10.0-android35.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/global.json b/global.json
index 031a73545..5166053f2 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,4 @@
 {
-    "sdk": 
-    {
-        "version": "8.0.404",
-        "rollForward": "patch"
-    },
     "msbuild-sdks": 
     {
         "MSBuild.Sdk.Extras": "3.0.44",
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index d8a473f19..b61494e2a 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -3,7 +3,7 @@
   which is tuned for building bindings packages. -->
   <PropertyGroup>
     <!-- Default TFM's we build for -->
-    <_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
-    <_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
+    <_DefaultTargetFrameworks>net10.0-android</_DefaultTargetFrameworks>
+    <_DefaultNetTargetFrameworks>net10.0</_DefaultNetTargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/utilities.cake b/utilities.cake
index 5df32d855..12c9c0aae 100644
--- a/utilities.cake
+++ b/utilities.cake
@@ -1955,7 +1955,7 @@ Task("java-resolution-analysis")
 
             string dir = "output/java-resolution-analysis";
             EnsureDirectoryExists(dir);
-            EnsureDirectoryExists($"{dir}/net8.0-android");
+            EnsureDirectoryExists($"{dir}/net10.0-android");
 
             ConcurrentDictionary
                     <

From 728dd59bba7557a7fbb5fe5d8c8ad144c2d3f967 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 22 Jan 2025 16:50:36 -0600
Subject: [PATCH 2/2] Added `-preview.net10` suffix

---
 Directory.Build.props                                           | 2 ++
 ...androidx.appcompat.appcompat-resources-typeforwarders.csproj | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6ffe3ba16..2955c1b7c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,8 @@
     <_DefaultTargetFrameworks>net10.0-android</_DefaultTargetFrameworks>
     <_DefaultNetTargetFrameworks>net10.0</_DefaultNetTargetFrameworks>
 
+    <PackageVersionSuffix>-preview.net10</PackageVersionSuffix>
+
     <!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
 
diff --git a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
index 3564cc5ea..0f363888e 100644
--- a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
+++ b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj
@@ -33,7 +33,7 @@
     <PackageTags>Xamarin AndroidX Xamarin.AndroidX Support Google appcompat-resources</PackageTags>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <PackageIcon>icon.png</PackageIcon>
-    <PackageVersion>1.1.0.3</PackageVersion>
+    <PackageVersion>1.1.0.3$(PackageVersionSuffix)</PackageVersion>
     <!-- Include symbol files (*.pdb) in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>