From 599a862aab0c1c78cfa8687c177d9af2a76cd448 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 18 Oct 2023 20:11:05 +0000
Subject: [PATCH 1/8] ChannelMap: add entry for 9.0

---
 scripts/channel_map.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/channel_map.py b/scripts/channel_map.py
index 2a38c3f8f1a..7dec6cab377 100644
--- a/scripts/channel_map.py
+++ b/scripts/channel_map.py
@@ -3,8 +3,8 @@
 class ChannelMap():
     channel_map = {
         'main': {
-            'tfm': 'net8.0',
-            'branch': '8.0',
+            'tfm': 'net9.0',
+            'branch': '9.0',
             'quality': 'daily'
         },
         '8.0': {

From 54dca4c790d6cff8d48c153629e7dc8329fe9de5 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 03:32:36 +0000
Subject: [PATCH 2/8] nuget.config: add dotnet9 source

---
 NuGet.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.config b/NuGet.config
index 94b1fa58f8c..00406457a3d 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -6,6 +6,7 @@
   <packageSources>
     <clear />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />

From e06e4e22044c79b619f1abc79214c89faab88cb2 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 04:01:44 +0000
Subject: [PATCH 3/8] Add 9.0 versions for package references

---
 src/scenarios/build-common/Blazor.PackageVersions.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/scenarios/build-common/Blazor.PackageVersions.props b/src/scenarios/build-common/Blazor.PackageVersions.props
index e2b4415a199..2240cff4408 100644
--- a/src/scenarios/build-common/Blazor.PackageVersions.props
+++ b/src/scenarios/build-common/Blazor.PackageVersions.props
@@ -1,4 +1,9 @@
 <Project>
+    <PropertyGroup Condition="$(TargetFrameworks.Contains('net9.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '9.0')))">
+        <AspNetCoreVersion>9.0.0-*</AspNetCoreVersion>
+        <BlazorVersion>9.0.0-*</BlazorVersion>
+        <SystemNetHttpJsonVersion>9.0.0-*</SystemNetHttpJsonVersion>
+    </PropertyGroup>
     <PropertyGroup Condition="$(TargetFrameworks.Contains('net8.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0')))">
         <AspNetCoreVersion>8.0.0-*</AspNetCoreVersion>
         <BlazorVersion>8.0.0-*</BlazorVersion>

From 3bb726c92c178e209d43af2b5cee546b6636320f Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 05:56:56 +0000
Subject: [PATCH 4/8] [wasm] Pass correct runtime option for net9.0

---
 scripts/micro_benchmarks.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/micro_benchmarks.py b/scripts/micro_benchmarks.py
index 98305424deb..81126b9eb08 100755
--- a/scripts/micro_benchmarks.py
+++ b/scripts/micro_benchmarks.py
@@ -268,6 +268,10 @@ def __get_benchmarkdotnet_arguments(framework: str, args: Any) -> List[str]:
             run_args += ['--runtimes', 'wasmnet70']
         elif framework == "net8.0":
             run_args += ['--runtimes', 'wasmnet80']
+        elif framework == "net9.0":
+            run_args += ['--runtimes', 'wasmnet90']
+        else:
+            raise ArgumentTypeError('Framework {} is not supported for wasm'.format(framework))
 
     # Increase default 2 min build timeout to accommodate slow (or even very slow) hardware
     if not args.bdn_arguments or '--buildTimeout' not in args.bdn_arguments:

From dab60aef5bbadac11807159a4734af4c1ae7acc5 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 15:43:38 +0000
Subject: [PATCH 5/8] Bump BDN to 0.13.10-nightly.20231019.90

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 9cc7fac465f..2b4a0e84ea0 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
   <PropertyGroup>
     <MicrosoftNETILLinkTasksVersion>8.0.0-rtm.23517.16</MicrosoftNETILLinkTasksVersion>
     <MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23517.16</MicrosoftNETILLinkPackageVersion>
-    <BenchmarkDotNetVersion>0.13.9-nightly.20230908.70</BenchmarkDotNetVersion>
+    <BenchmarkDotNetVersion>0.13.10-nightly.20231019.90</BenchmarkDotNetVersion>
     <SystemThreadingChannelsPackageVersion>8.0.0-rtm.23517.16</SystemThreadingChannelsPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>8.0.0-rtm.23517.16</MicrosoftExtensionsLoggingPackageVersion>
   </PropertyGroup>

From bda2d156387ce5428ed9d7b6ff2cc5d01fc76d86 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 12:58:01 -0400
Subject: [PATCH 6/8] Update NuGet.config

Co-authored-by: Larry Ewing <lewing@microsoft.com>
---
 NuGet.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NuGet.config b/NuGet.config
index 00406457a3d..c0a4a2983a9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,6 +7,7 @@
     <clear />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
+    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
     <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />

From 88b8dcdecb72696e0e6179bfd7010f28933c3547 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 16:59:41 +0000
Subject: [PATCH 7/8] Address review feedback: add channel map entry for net9.0

---
 scripts/channel_map.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/channel_map.py b/scripts/channel_map.py
index 7dec6cab377..e457b4cbb68 100644
--- a/scripts/channel_map.py
+++ b/scripts/channel_map.py
@@ -7,6 +7,11 @@ class ChannelMap():
             'branch': '9.0',
             'quality': 'daily'
         },
+        '9.0': {
+            'tfm': 'net9.0',
+            'branch': '9.0',
+            'quality': 'daily'
+        },
         '8.0': {
             'tfm': 'net8.0',
             'branch': '8.0',

From 4db01c7c3d403a6e53f264e2624c19acf7697d53 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 19 Oct 2023 17:43:10 +0000
Subject: [PATCH 8/8] Blazor: update warning condition for package versions
 needing an update

---
 src/scenarios/build-common/Blazor.Directory.Build.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scenarios/build-common/Blazor.Directory.Build.targets b/src/scenarios/build-common/Blazor.Directory.Build.targets
index 1996c482497..d58c684292e 100644
--- a/src/scenarios/build-common/Blazor.Directory.Build.targets
+++ b/src/scenarios/build-common/Blazor.Directory.Build.targets
@@ -5,7 +5,7 @@
       Text="Package versions for blazor/aspnetcore not set. %24(AspNetCoreVersion)=$(AspNetCoreVersion), %24(BlazorVersion)==$(BlazorVersion), and %24(SystemNetHttpJsonVersion)=$(SystemNetHttpJsonVersion). TFM: $(TargetFramework)" />
 
     <Warning
-      Condition="$(TargetFrameworks.Contains('net9.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionGreaterThan('$(TargetFrameworkVersion)', '9.0')))"
+      Condition="$(TargetFrameworks.Contains('net10.0')) or ($(TargetFrameworkVersion) != '' and $([MSBuild]::VersionGreaterThan('$(TargetFrameworkVersion)', '9.0')))"
       Text="Package versions being used for blazor project might need to be updated for a new tfm. Current values: %24(AspNetCoreVersion)=$(AspNetCoreVersion), %24(BlazorVersion)==$(BlazorVersion), and %24(SystemNetHttpJsonVersion)=$(SystemNetHttpJsonVersion). TFM: $(TargetFramework)" />
   </Target>