Update the versions used to be .NET 9 and 10

.config/dotnet-tools.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "5.0.0",
+      "commands": [
+        "dotnet-cake"
+      ],
+      "rollForward": false
+    },
+    "dotnet-test-slicer": {
+      "version": "0.1.0-alpha7",
+      "commands": [
+        "dotnet-test-slicer"
+      ],
+      "rollForward": false
+    },
+    "api-tools": {
+      "version": "1.4.2-preview.2",
+      "commands": [
+        "api-tools"
+      ],
+      "rollForward": false
+    }
+  }
+}

.github/ISSUE_TEMPLATE/01-use-package.yml

@@ -15,6 +15,7 @@ body:
       options:
       - net8.0-android
       - net9.0-android
+      - net10.0-android (Preview)
       - Other
     validations:
       required: true
@@ -23,7 +24,7 @@ body:
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.14.0, .NET 9.0.100, etc.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/04-other.yml

@@ -14,6 +14,7 @@ body:
       options:
       - net8.0-android
       - net9.0-android
+      - net10.0-android (Preview)
       - Other
     validations:
       required: true
@@ -22,7 +23,7 @@ body:
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.9.0, .NET 8.0.100, etc.
+      placeholder: E.g. VS 2022 17.14.0, .NET 9.0.100, etc.
     validations:
       required: true
   - type: textarea

.github/copilot-instructions.md

@@ -136,7 +136,7 @@ For comprehensive guidance on troubleshooting binding issues, see: https://githu
 ## Target Frameworks
 
 ### Current Support
-- **Primary**: `net8.0-android` (API 21+)
+- **Primary**: `net9.0-android` (API 21+)
 - **Migration**: `net10.0-android` (API 35+) - migration capability exists but not currently enabled
 - **Legacy**: Xamarin.Android support ended May 1, 2024
 
@@ -150,12 +150,12 @@ For comprehensive guidance on troubleshooting binding issues, see: https://githu
 ### NuGet Package Structure
 ```
 lib/
-  net8.0-android34.0/
+  net9.0-android35.0/
     {assembly}.dll
   net10.0-android36.0/
     {assembly}.dll
 build/
-  net8.0-android34.0/
+  net9.0-android35.0/
     {package}.targets
   net10.0-android36.0/
     {package}.targets

BUILDING.md

@@ -4,7 +4,7 @@
 
 Before building the libraries and samples in this repository, you will need to install:
 
-  * [.NET](https://dotnet.microsoft.com/download) ([.NET SDK 8.0.404](https://github.com/dotnet/core/blob/main/release-notes/8.0/8.0.11/8.0.11.md?WT.mc_id=dotnet-35129-website) is currently required)
+  * [.NET 9.0](https://dotnet.microsoft.com/download) (.NET SDK 9.0 is currently required)
 
   * [Cake .NET Tool](http://cakebuild.net):
 

Directory.Build.props

@@ -6,8 +6,17 @@
     <RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
 
     <!-- Default TFM's we build for -->
-    <_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
-    <_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
+    <_DefaultNetTargetFramework>net9.0</_DefaultNetTargetFramework>
+    <!-- base -->
+    <_DefaultPlatformVersionBase>35</_DefaultPlatformVersionBase>
+    <_DefaultTargetFrameworkVersionBase>9.0</_DefaultTargetFrameworkVersionBase>
+    <_DefaultTargetFrameworkBase>net$(_DefaultTargetFrameworkVersionBase)-android$(_DefaultPlatformVersionBase).0</_DefaultTargetFrameworkBase>
+    <!-- next -->
+    <_DefaultPlatformVersionNext>36</_DefaultPlatformVersionNext>
+    <_DefaultTargetFrameworkVersionNext>10.0</_DefaultTargetFrameworkVersionNext>
+    <_DefaultTargetFrameworkNext>net$(_DefaultTargetFrameworkVersionNext)-android$(_DefaultPlatformVersionNext).0</_DefaultTargetFrameworkNext>
+    <!-- combined -->
+    <_DefaultTargetFrameworks>$(_DefaultTargetFrameworkBase);$(_DefaultTargetFrameworkNext)</_DefaultTargetFrameworks>
 
     <CheckEolWorkloads>false</CheckEolWorkloads>
 
@@ -85,13 +94,16 @@
 
   <!-- 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\$(_DefaultTargetFrameworkBase)" />
+    <AndroidXNuGetTargetFolders Include="buildTransitive\$(_DefaultTargetFrameworkBase)" />
+    <AndroidXNuGetTargetFolders Include="build\$(_DefaultTargetFrameworkNext)" />
+    <AndroidXNuGetTargetFolders Include="buildTransitive\$(_DefaultTargetFrameworkNext)" />
   </ItemGroup>
 
   <!-- Folders that _._ files need to go into for packages without managed libraries -->
   <ItemGroup>
-    <AndroidXNuGetLibFolders Include="lib\net8.0-android34.0" />
+    <AndroidXNuGetLibFolders Include="lib\$(_DefaultTargetFrameworkBase)" />
+    <AndroidXNuGetLibFolders Include="lib\$(_DefaultTargetFrameworkNext)" />
   </ItemGroup>
 
   <ItemGroup>

azure-pipelines-public.yml

@@ -3,12 +3,6 @@ trigger: none
 pr:
 - main
 
-parameters:
-- name: RunDotnetNextTest
-  displayName: Run on .NET next preview?
-  type: boolean
-  default: false
-
 variables:
 - template: build/ci/variables.yml
 
@@ -23,7 +17,6 @@ stages:
         name: $(NetCorePublicPoolName)
         demands:
         - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
-      runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
       use1ESTemplate: false
       installAndroidDependencies: true
 
@@ -37,7 +30,6 @@ stages:
       buildPool:
         name: Azure Pipelines
         vmImage: macOS-15
-      runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
       use1ESTemplate: false
 
 - template: build/ci/stage-standard-tests.yml@self
@@ -46,5 +38,4 @@ stages:
       name: $(NetCorePublicPoolName)
       demands:
       - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
-    runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
     installAndroidDependencies: true

azure-pipelines.yml

@@ -16,10 +16,6 @@ parameters:
   displayName: Run Extended Tests?
   type: boolean
   default: false
-- name: RunDotnetNextTest
-  displayName: Run on .NET next preview?
-  type: boolean
-  default: false
 
 variables:
   # Variables used by both AndroidX/GPS go in the template
@@ -61,7 +57,6 @@ extends:
             image: $(windowsImage)
             os: windows
           runAPIScan: true
-          runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - stage: build_mac
       displayName: Build - Mac
@@ -77,15 +72,13 @@ extends:
             demands:
               - macOS.Name -equals Sonoma
               - macOS.Architecture -equals x64
-          runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - template: build/ci/stage-standard-tests.yml@self
       parameters:
         buildPool:
           name: $(windowsAgentPoolName)
           image: $(windowsImage)
           os: windows
-        runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - template: build/ci/stage-extended-tests.yml@self
       parameters:
@@ -94,6 +87,5 @@ extends:
           name: $(windowsAgentPoolName)
           image: $(windowsImage)
           os: windows
-        runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - template: build/ci/stage-sign-artifacts.yml@self

build.cake

@@ -7,28 +7,21 @@
 #addin nuget:?package=SharpZipLib&version=1.4.2
 
 // Imported scripts
-#load "build/cake/nuget-install.cake"
 #load "build/cake/setup-environment.cake"
 #load "build/cake/update-config.cake"
 #load "build/cake/tests.cake"
 #load "build/cake/gps-parameters.cake"
-#load "build/cake/dotnet-next.cake"
 #load "build/cake/binderate.cake"
 #load "build/cake/build-and-package.cake"
 #load "build/cake/validations.cake"
 #load "build/cake/executive-order.cake"
 #load "build/cake/clean.cake"
 #load "build/cake/performance-timings.cake"
-#load "build/cake/build-android-libraries-net10-net8.cake"
-
-// Migrate packages to net10 
-bool IsMigratingNet10 = false;
 
 using System.Xml.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-
 // The main configuration points
 var TARGET = Argument ("t", Argument ("target", "Default"));
 var CONFIGURATION = Argument ("c", Argument ("configuration", "Release"));
@@ -38,6 +31,7 @@ var VERBOSITY = Argument ("v", Argument ("verbosity", Verbosity.Normal));
 var BUILD_COMMIT = EnvironmentVariable("BUILD_COMMIT") ?? "DEV";
 var BUILD_NUMBER = EnvironmentVariable("BUILD_NUMBER") ?? "DEBUG";
 var BUILD_TIMESTAMP = DateTime.UtcNow.ToString();
+var NUGET_VERSION_SUFFIX = EnvironmentVariable("NUGET_VERSION_SUFFIX") ?? "";
 
 var JAVA_HOME = EnvironmentVariable ("JAVA_HOME") ?? Argument ("java_home", "");
 
@@ -48,13 +42,6 @@ Information ($"BUILD_COMMIT         : {BUILD_COMMIT}");
 Information ($"BUILD_NUMBER         : {BUILD_NUMBER}");
 Information ($"BUILD_TIMESTAMP      : {BUILD_TIMESTAMP}");
 
-RunTarget("nuget-install");
-
-if (IsMigratingNet10) 
-{
-    RunTarget("build-android-libraries-net10-net8");
-}
-
 Task ("packages")
     .IsDependentOn ("binderate")
     .IsDependentOn ("nuget");

build/cake/build-and-package.cake

@@ -10,6 +10,7 @@ Task ("nuget")
         .EnableBinaryLogger ($"./output/nuget.{CONFIGURATION}.binlog")
         .WithProperty ("NoBuild", "true")
         .WithProperty ("PackageOutputPath", MakeAbsolute ((DirectoryPath)"./output/").FullPath)
+        .WithProperty ("PackageVersionSuffix", NUGET_VERSION_SUFFIX)
         .WithTarget ("Pack");
 
     settings.NodeReuse = false;
@@ -18,32 +19,8 @@ Task ("nuget")
         "./generated/AndroidX.sln", 
         new DotNetBuildSettings { MSBuildSettings = settings }
     );
-
-    RunTarget("nuget-uninstall");
-
 });
 
-Task ("nuget-pack-without-build")
-    .Does
-    (
-        () =>
-        {
-            var settings = new DotNetMSBuildSettings ()
-                .SetConfiguration (CONFIGURATION)
-                .EnableBinaryLogger ($"./output/nuget-pack-without-build.{CONFIGURATION}.binlog")
-                .WithProperty ("NoBuild", "true")
-                .WithProperty ("PackageOutputPath", MakeAbsolute ((DirectoryPath)"./output/").FullPath)
-                .WithTarget ("Pack");
-
-            DotNetBuild 
-                    (
-                        "./generated/AndroidX.sln", 
-                        new DotNetBuildSettings { MSBuildSettings = settings }
-                    );
-        }
-    );
-
-
 // Builds the .csproj projects
 Task ("libs")
     .IsDependentOn("metadata-verify")