From b64b6d900a32a05238927d5ca2ffdd318d5b9dd6 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 13:50:36 +0200
Subject: [PATCH 1/7] NET9rc2

---
 .devcontainer/devcontainer.json | 2 +-
 Directory.Build.props           | 3 +--
 eng/Versions.props              | 2 +-
 global.json                     | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2600981e3c5..0c6c6881251 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,7 @@
 // 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-rc.1",
+    "image": "mcr.microsoft.com/dotnet/sdk:9.0.100-rc.2",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2.5.1": {},
         "ghcr.io/devcontainers/features/git:1.3.2": {},
diff --git a/Directory.Build.props b/Directory.Build.props
index 7f5b362cb34..0ea96a1f20e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -47,8 +47,7 @@
   <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
     <DisableAutoSetFscCompilerPath>false</DisableAutoSetFscCompilerPath>
 
-    <!-- TODO(vlza): This probably should be `true` once fslib with nullness ships, since shipped library is preferred by default when building this solution. -->
-    <FSHARPCORE_USE_PACKAGE Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">false</FSHARPCORE_USE_PACKAGE>
+    <FSHARPCORE_USE_PACKAGE Condition="'$(FSHARPCORE_USE_PACKAGE)' == ''">true</FSHARPCORE_USE_PACKAGE>
 
     <DISABLE_ARCADE Condition="'$(DISABLE_ARCADE)' == ''">true</DISABLE_ARCADE>
     <ArtifactsDir>$(MSBuildThisFileDirectory)artifacts/</ArtifactsDir>
diff --git a/eng/Versions.props b/eng/Versions.props
index d89aec3f3cd..4252f548c66 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -37,7 +37,7 @@
     <FSharpLibrariesChangelogVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSharpLibrariesChangelogVersion>
     <!-- -->
     <!-- The current published nuget package -->
-    <FSharpCoreShippedPackageVersionValue>8.0.400</FSharpCoreShippedPackageVersionValue>
+    <FSharpCoreShippedPackageVersionValue>9.0.100-beta.24466.6</FSharpCoreShippedPackageVersionValue>
     <!-- -->
     <!-- The pattern for specifying the preview package -->
     <FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
diff --git a/global.json b/global.json
index b66eed16d21..3f653af33e0 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,10 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.1.24452.12",
+    "version": "9.0.100-rc.2.24474.11",
     "allowPrerelease": true
   },
   "tools": {
-    "dotnet": "9.0.100-rc.1.24452.12",
+    "dotnet": "9.0.100-rc.2.24474.11",
     "vs": {
       "version": "17.8",
       "components": [

From b50a147b5077b5c50dd631b3ddece2f908e8ee06 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 14:15:47 +0200
Subject: [PATCH 2/7] nowarn

---
 Directory.Build.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0ea96a1f20e..4bb6c5a4920 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -10,6 +10,11 @@
     <IgnoreMibc Condition="'$(IgnoreMibc)' == ''">$(DotNetBuildSourceOnly)</IgnoreMibc>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- TODO: This needs to be removed once we merge/release the new SDK. -->
+    <NoWarn>$(NoWarn);FS0064</NoWarn>
+  </PropertyGroup>
+
   <!--
    When developers load the FSharp.Compiler.Service solution we set FSHARPCORE_USE_PACKAGE to true if it hasn't already been set to a value.
    This option ensures that building and testing uses the specified FSharp.Core nuget package instead of the local FSharp.Core project.

From ab072c4da2e22b3c13dff4a878e51a3611d60f2f Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 14:51:24 +0200
Subject: [PATCH 3/7] nowarn

---
 Directory.Build.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 4bb6c5a4920..8802ca237b5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- TODO: This needs to be removed once we merge/release the new SDK. -->
-    <NoWarn>$(NoWarn);FS0064</NoWarn>
+    <!-- TODO: These need to be removed once we merge/release the new SDK with noward and line fixes. -->
+    <NoWarn>$(NoWarn);FS0064;FS1182</NoWarn>
   </PropertyGroup>
 
   <!--

From 1bd3d8c7d1ed870436ef7985ed62851b18c93681 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 15:57:34 +0200
Subject: [PATCH 4/7] nowarn

---
 src/Compiler/FSharp.Compiler.Service.fsproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 45b5bda0d10..2bc7d0e4b83 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -10,6 +10,10 @@
     <NoWarn>$(NoWarn);75</NoWarn> <!-- InternalCommandLineOption -->
     <NoWarn>$(NoWarn);1204</NoWarn> <!-- This construct is for use in the FSharp.Core library and should not be used directly -->
     <NoWarn>$(NoWarn);NU5125</NoWarn>
+
+    <!-- TODO: This needs to be removed once we merge/release the new SDK with noward and line fixes. -->
+    <NoWarn>$(NoWarn);1182</NoWarn>
+
     <AssemblyName>FSharp.Compiler.Service</AssemblyName>
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>

From a416b2c2eeb5fd9103aa9c93ac9ef7a813658728 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 16:00:10 +0200
Subject: [PATCH 5/7] nowarn

---
 src/Compiler/FSharp.Compiler.Service.fsproj | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 2bc7d0e4b83..08f452836f8 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -10,10 +10,6 @@
     <NoWarn>$(NoWarn);75</NoWarn> <!-- InternalCommandLineOption -->
     <NoWarn>$(NoWarn);1204</NoWarn> <!-- This construct is for use in the FSharp.Core library and should not be used directly -->
     <NoWarn>$(NoWarn);NU5125</NoWarn>
-
-    <!-- TODO: This needs to be removed once we merge/release the new SDK with noward and line fixes. -->
-    <NoWarn>$(NoWarn);1182</NoWarn>
-
     <AssemblyName>FSharp.Compiler.Service</AssemblyName>
     <AllowCrossTargeting>true</AllowCrossTargeting>
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
@@ -28,8 +24,10 @@
     <TargetFrameworks Condition=" '$(OfficialBuildId)' == '' AND '$(FSharpNetCoreProductDefaultTargetFramework)' != '' AND '$(Configuration)' != 'Proto' AND '$(SKIP_NETCURRENT_FSC_BUILD)' != 'true' ">$(FSharpNetCoreProductDefaultTargetFramework);$(TargetFrameworks)</TargetFrameworks>
     <DefineConstants Condition="'$(FSHARPCORE_USE_PACKAGE)' == 'true'">$(DefineConstants);FSHARPCORE_USE_PACKAGE</DefineConstants>
     <OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
-    <!-- 1182: Unused variables -->
-    <OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
+
+    <!-- TODO: This needs to be re-enabled once we merge/release the new SDK with noward and line fixes. -->
+    <!-- 1182: Unused variables
+    <OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags> -->
     <!-- 3218: ArgumentsInSigAndImplMismatch -->
     <OtherFlags>$(OtherFlags) --warnon:3218</OtherFlags>
     <!-- 3390: xmlDocBadlyFormed -->

From ebe3797f5f225788518c82a93d3b264d42dda1d7 Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 16:11:35 +0200
Subject: [PATCH 6/7] nowarn

---
 src/Compiler/FSharp.Compiler.Service.fsproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 08f452836f8..e663391a391 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -26,8 +26,9 @@
     <OtherFlags>$(OtherFlags) --extraoptimizationloops:1</OtherFlags>
 
     <!-- TODO: This needs to be re-enabled once we merge/release the new SDK with noward and line fixes. -->
-    <!-- 1182: Unused variables
-    <OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags> -->
+    <!-- 1182: Unused variables -->
+    <OtherFlags>$(OtherFlags) --warnoff:1182</OtherFlags>
+
     <!-- 3218: ArgumentsInSigAndImplMismatch -->
     <OtherFlags>$(OtherFlags) --warnon:3218</OtherFlags>
     <!-- 3390: xmlDocBadlyFormed -->

From 129dc04cd7d9bd8f36b3de6cb76130c73ab4f60b Mon Sep 17 00:00:00 2001
From: Vlad Zarytovskii <vzaritovsky@hotmail.com>
Date: Wed, 9 Oct 2024 16:18:43 +0200
Subject: [PATCH 7/7] nowarn

---
 src/Compiler/FSharp.Compiler.Service.fsproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index e663391a391..36b184502f1 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -27,7 +27,7 @@
 
     <!-- TODO: This needs to be re-enabled once we merge/release the new SDK with noward and line fixes. -->
     <!-- 1182: Unused variables -->
-    <OtherFlags>$(OtherFlags) --warnoff:1182</OtherFlags>
+    <OtherFlags>$(OtherFlags) --nowarn:1182</OtherFlags>
 
     <!-- 3218: ArgumentsInSigAndImplMismatch -->
     <OtherFlags>$(OtherFlags) --warnon:3218</OtherFlags>