Bump to .NET 9.

Make.config

@@ -12,7 +12,7 @@ CURL = curl --fail --location --connect-timeout 15 $(if $(V),--verbose,--silent)
 # --retry-all-errors: ignore the definition of insanity and retry even for errors that seem like you'd get the same result (such as 404). This isn't the real purpose, because this will also retry errors that will get a different result (such as connection failures / resets), which apparently --retry doesn't cover.
 CURL_RETRY = $(CURL) --retry 20 --retry-delay 2 --retry-all-errors
 
-DOTNET_TFM=net8.0
+DOTNET_TFM=net9.0
 DOTNET_MAJOR_VERSION:=$(firstword $(subst ., ,$(subst net,,$(DOTNET_TFM))))
 # calculate commit distance and store it in a file so that we don't have to re-calculate it every time make is executed.
 
@@ -134,8 +134,8 @@ endif
 ##
 ## Note that the prerelease identifier should be as short as possible, because otherwise
 ## the resulting package name can become too long for MSIs.
-NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net8-rtm
-NUGET_HARDCODED_PRERELEASE_BRANCH=net8.0
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net9-p1
+NUGET_HARDCODED_PRERELEASE_BRANCH=net9.0
 
 # compute the alphanumeric version of branch names
 NUGET_RELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_RELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-')

dotnet/Makefile

@@ -175,7 +175,7 @@ Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.json: Makefile $(TOP)/Make.con
 
 Workloads/Microsoft.NET.Sdk.$(1)/WorkloadManifest.targets: Makefile $(TOP)/Make.config.inc $(TOP)/.git/HEAD $(TOP)/.git/index Makefile generate-workloadmanifest-targets.csharp | Workloads/Microsoft.NET.Sdk.$(1)
 	$$(Q) rm -f $$@.tmp
-	$$(Q_GEN) ./generate-workloadmanifest-targets.csharp "$(1)" "$$@.tmp" "$$(DOTNET_WINDOWS_PLATFORMS)" "$(DOTNET_TFM)" "net7.0"
+	$$(Q_GEN) ./generate-workloadmanifest-targets.csharp "$(1)" "$$@.tmp" "$$(DOTNET_WINDOWS_PLATFORMS)" "$(DOTNET_TFM)" "net7.0 net8.0"
 	$$(Q) mv $$@.tmp $$@
 
 Workloads/Microsoft.NET.Sdk.$(1)/LICENSE: $(TOP)/LICENSE | Workloads/Microsoft.NET.Sdk.$(1)

dotnet/generate-workloadmanifest-json.csharp

@@ -34,9 +34,11 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
 	writer.WriteLine ($"		\"{platformLowerCase}\": {{");
 	writer.WriteLine ($"			\"description\": \".NET SDK Workload for building {platform} applications.\",");
 	writer.WriteLine ($"			\"packs\": [");
+	writer.WriteLine ($"				\"Microsoft.{platform}.Sdk.net9\",");
 	writer.WriteLine ($"				\"Microsoft.{platform}.Sdk.net8\",");
 	writer.WriteLine ($"				\"Microsoft.{platform}.Sdk.net7\",");
 	if (hasWindows) {
+		writer.WriteLine ($"				\"Microsoft.{platform}.Windows.Sdk.Aliased.net9\",");
 		writer.WriteLine ($"				\"Microsoft.{platform}.Windows.Sdk.Aliased.net8\",");
 		writer.WriteLine ($"				\"Microsoft.{platform}.Windows.Sdk.Aliased.net7\",");
 	}
@@ -44,20 +46,29 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
 	foreach (var rid in runtimeIdentifiers) {
 		writer.WriteLine ($"				\"Microsoft.{platform}.Runtime.{rid}\",");
 	}
-	writer.WriteLine ($"				\"Microsoft.{platform}.Templates.net8\"");
+	writer.WriteLine ($"				\"Microsoft.{platform}.Templates.net9\"");
 	writer.WriteLine ($"			],");
 	writer.WriteLine ($"			\"extends\": [");
 	if (platform == "macOS") {
 		writer.WriteLine ($"				\"microsoft-net-runtime-mono-tooling\",");
+		// writer.WriteLine ($"				\"microsoft-net-runtime-mono-tooling-net8\",");
 		writer.WriteLine ($"				\"microsoft-net-runtime-mono-tooling-net7\",");
 	} else {
 		writer.WriteLine ($"				\"microsoft-net-runtime-{platformLowerCase}\",");
+		// writer.WriteLine ($"				\"microsoft-net-runtime-{platformLowerCase}-net8\",");
 		writer.WriteLine ($"				\"microsoft-net-runtime-{platformLowerCase}-net7\",");
 	}
 	writer.WriteLine ($"			]");
 	writer.WriteLine ($"		}},");
 	writer.WriteLine ($"	}},");
 	writer.WriteLine ($"	\"packs\": {{");
+	writer.WriteLine ($"		\"Microsoft.{platform}.Sdk.net9\": {{");
+	writer.WriteLine ($"			\"kind\": \"sdk\",");
+	writer.WriteLine ($"			\"version\": \"{version}\",");
+	writer.WriteLine ($"			\"alias-to\": {{");
+	writer.WriteLine ($"				\"any\": \"Microsoft.{platform}.Sdk\"");
+	writer.WriteLine ($"			}}");
+	writer.WriteLine ($"		}},");
 	writer.WriteLine ($"		\"Microsoft.{platform}.Sdk.net8\": {{");
 	writer.WriteLine ($"			\"kind\": \"sdk\",");
 	writer.WriteLine ($"			\"version\": \"{version}\",");
@@ -73,6 +84,15 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
 	writer.WriteLine ($"			}}");
 	writer.WriteLine ($"		}},");
 	if (hasWindows) {
+		writer.WriteLine ($"		\"Microsoft.{platform}.Windows.Sdk.Aliased.net9\": {{");
+		writer.WriteLine ($"			\"kind\": \"sdk\",");
+		writer.WriteLine ($"			\"version\": \"{version}\",");
+		writer.WriteLine ($"			\"alias-to\": {{");
+		writer.WriteLine ($"				\"win-x64\": \"Microsoft.{platform}.Windows.Sdk\",");
+		writer.WriteLine ($"				\"win-x86\": \"Microsoft.{platform}.Windows.Sdk\",");
+		writer.WriteLine ($"				\"win-arm64\": \"Microsoft.{platform}.Windows.Sdk\",");
+		writer.WriteLine ($"			}}");
+		writer.WriteLine ($"		}},");
 		writer.WriteLine ($"		\"Microsoft.{platform}.Windows.Sdk.Aliased.net8\": {{");
 		writer.WriteLine ($"			\"kind\": \"sdk\",");
 		writer.WriteLine ($"			\"version\": \"{version}\",");
@@ -102,7 +122,7 @@ using (TextWriter writer = new StreamWriter (outputPath)) {
 		writer.WriteLine ($"			\"version\": \"{version}\"");
 		writer.WriteLine ($"		}},");
 	}
-	writer.WriteLine ($"		\"Microsoft.{platform}.Templates.net8\": {{");
+	writer.WriteLine ($"		\"Microsoft.{platform}.Templates.net9\": {{");
 	writer.WriteLine ($"			\"kind\": \"template\",");
 	writer.WriteLine ($"			\"version\": \"{version}\",");
 		writer.WriteLine ($"			\"alias-to\": {{");

tools/common/SdkVersions.cs

@@ -157,7 +157,7 @@ namespace Xamarin {
 #endif
 
 	static class DotNetVersions {
-		public const string Tfm = "net8.0";
-		public const string Version = "8.0";
+		public const string Tfm = "net9.0";
+		public const string Version = "9.0";
 	}
 }

tools/devops/automation/post-build-pipeline.yml

@@ -37,6 +37,7 @@ resources:
       - release/*
       - net7.0
       - net8.0
+      - net9.0
       - release-test/* # this is for testing the release pipeline on branches without GitHub's branch protection (so we can automate tests without requiring commits to go through pull requests, etc.).
       stages:
       - prepare_release

tools/devops/automation/templates/main-stage.yml

@@ -244,6 +244,7 @@ stages:
           startsWith(variables['Build.SourceBranch'], 'refs/heads/release-test/'),
           eq(variables['Build.SourceBranch'], 'refs/heads/net7.0'),
           eq(variables['Build.SourceBranch'], 'refs/heads/net8.0'),
+          eq(variables['Build.SourceBranch'], 'refs/heads/net9.0'),
           eq(parameters.forceInsertion, true)
         )
       )