.NET Source-Build 9.0.100-rc.2.24474.1 October 2024 Updates (#43993)

Co-authored-by: Ella Hathaway <ellahathaway@microsoft.com> Co-authored-by: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com>
dotnet · Oct 9, 2024 · 2d0b3f7 · 2d0b3f7
1 parent 860e48b
commit 2d0b3f7
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 7 deletions.
diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml
@@ -2,9 +2,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24408.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24466.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
+      <Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
@@ -23,8 +23,8 @@
       of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
       are not necessary, and this property is removed from the file.
     -->
-    <PrivateSourceBuiltSdkVersion>9.0.100-rc.1.24452.1</PrivateSourceBuiltSdkVersion>
-    <PrivateSourceBuiltArtifactsVersion>9.0.100-rc.1.24452.1</PrivateSourceBuiltArtifactsVersion>
+    <PrivateSourceBuiltSdkVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltSdkVersion>
+    <PrivateSourceBuiltArtifactsVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltArtifactsVersion>
     <!-- command-line-api dependencies -->
     <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
     <!-- msbuild dependencies -->

diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
@@ -1,10 +1,10 @@
 {
   "tools": {
-    "dotnet": "9.0.100-rc.1.24452.12"
+    "dotnet": "9.0.100-rc.2.24474.11"
   },
   "msbuild-sdks": {
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2"
   }
 }
diff --git a/...ourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch b/...ourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch
@@ -4,7 +4,7 @@ Date: Mon, 16 Sep 2024 13:21:58 -0700
 Subject: [PATCH] Fix17713 - Reverting PR - 17649 - Make the interaction
  between #line and #nowarn directives consistent (#17724)
 
-Backport: https://github.com/dotnet/fsharp/pull/17724
+Backport: https://github.com/dotnet/fsharp/pull/17859
 
 ---
  buildtools/fsyacc/fsyaccdriver.fs             |  2 -

diff --git a/src/SourceBuild/patches/fsharp/0002-NoWarns-for-FSharp-Failures.patch b/src/SourceBuild/patches/fsharp/0002-NoWarns-for-FSharp-Failures.patch
@@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ella Hathaway <ellahathaway@microsoft.com>
+Date: Wed, 9 Oct 2024 17:14:25 +0000
+Subject: [PATCH] NoWarns for FSharp Failures
+
+Backport: https://github.com/dotnet/fsharp/pull/17859
+
+---
+ buildtools/fslex/fslex.fsproj               | 1 +
+ buildtools/fsyacc/fsyacc.fsproj             | 1 +
+ src/Compiler/FSharp.Compiler.Service.fsproj | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
+index 5dfef2f0e3..b450de1668 100644
+--- a/buildtools/fslex/fslex.fsproj
++++ b/buildtools/fslex/fslex.fsproj
+@@ -5,6 +5,7 @@
+     <TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
++    <NoWarn>$(NoWarn);64;1182;1204</NoWarn>         <!--Temporary fix for sourcebuild -->
+   </PropertyGroup>
+
+   <PropertyGroup>
+diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
+index 1ff8a11075..5f97b762e0 100644
+--- a/buildtools/fsyacc/fsyacc.fsproj
++++ b/buildtools/fsyacc/fsyacc.fsproj
+@@ -5,6 +5,7 @@
+     <TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
++    <NoWarn>$(NoWarn);64;1182;1204</NoWarn>         <!--Temporary fix for sourcebuild -->
+   </PropertyGroup>
+
+   <PropertyGroup>
+diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
+index 45b5bda0d1..8029bb6d45 100644
+--- a/src/Compiler/FSharp.Compiler.Service.fsproj
++++ b/src/Compiler/FSharp.Compiler.Service.fsproj
+@@ -10,6 +10,8 @@
+     <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>
++    <NoWarn>$(NoWarn);64;1182;1204</NoWarn>         <!--Temporary fix for sourcebuild -->
++    <OtherFlags>$(OtherFlags) --warnaserror-:1182</OtherFlags>         <!--Temporary fix for sourcebuild -->
+     <AssemblyName>FSharp.Compiler.Service</AssemblyName>
+     <AllowCrossTargeting>true</AllowCrossTargeting>
+     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>