From bc40f6aaaadbe2fb999c0d5357f357fa13113603 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Thu, 22 Aug 2024 16:41:20 +0200
Subject: [PATCH] Update to .NET9p7 SDK (#17537)

* Update to .NET9p7 SDK

* Add dotnet9 feed

* Update trimming

* update trimming #2
---
 .devcontainer/devcontainer.json      | 10 +++++-----
 NuGet.config                         |  2 ++
 global.json                          |  4 ++--
 tests/AheadOfTime/Trimming/check.ps1 |  4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 49bc4403ff5..ac63d29017f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,12 +1,12 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
 {
     "name": "F#",
-    "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.6",
+    "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-preview.7",
     "features": {
-        "ghcr.io/devcontainers/features/common-utils:2.4.3": {},
-        "ghcr.io/devcontainers/features/git:1.2.0": {},
-        "ghcr.io/devcontainers/features/github-cli:1.0.11": {},
-        "ghcr.io/devcontainers/features/dotnet:2.1.0": {}
+        "ghcr.io/devcontainers/features/common-utils:2.4.6": {},
+        "ghcr.io/devcontainers/features/git:1.3.2": {},
+        "ghcr.io/devcontainers/features/github-cli:1.0.13": {},
+        "ghcr.io/devcontainers/features/dotnet:2.1.2": {}
     },
     "hostRequirements": {
         "cpus": 2,
diff --git a/NuGet.config b/NuGet.config
index 72a88909ad8..e348c8b6abe 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -13,6 +13,8 @@
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/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="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="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
diff --git a/global.json b/global.json
index 96b23607c96..523cf79f061 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,10 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.6.24328.19",
+    "version": "9.0.100-preview.7.24407.12",
     "allowPrerelease": true
   },
   "tools": {
-    "dotnet": "9.0.100-preview.6.24328.19",
+    "dotnet": "9.0.100-preview.7.24407.12",
     "vs": {
       "version": "17.8",
       "components": [
diff --git a/tests/AheadOfTime/Trimming/check.ps1 b/tests/AheadOfTime/Trimming/check.ps1
index dcaafb03ce0..0f37c11cf31 100644
--- a/tests/AheadOfTime/Trimming/check.ps1
+++ b/tests/AheadOfTime/Trimming/check.ps1
@@ -43,7 +43,7 @@ function CheckTrim($root, $tfm, $outputfile, $expected_len) {
 # error NETSDK1124: Trimming assemblies requires .NET Core 3.0 or higher.
 
 # Check net7.0 trimmed assemblies
-CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 286208
+CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.Core.dll" -expected_len 287232
 
 # Check net8.0 trimmed assemblies
-CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8819712
+CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 8821248