diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 702b50124e0e..566567e99432 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 04b9022eba9c184a8036328af513c22e6949e8b6 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 6b00710b51c8..1d646f1bb297 100644 --- 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. --> - 9.0.100-rc.1.24452.1 - 9.0.100-rc.1.24452.1 + 9.0.100-rc.2.24474.1 + 9.0.100-rc.2.24474.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 285da6473c91..1f0e02cea1fd 100644 --- 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/src/SourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch b/src/SourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch index 2ac007ef3473..4cbf59462f1b 100644 --- a/src/SourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch +++ b/src/SourceBuild/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 new file mode 100644 index 000000000000..8780ecc0cc65 --- /dev/null +++ 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 +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 @@ + $(FSharpNetCoreProductTargetFramework) + true + LatestMajor ++ $(NoWarn);64;1182;1204 + + + +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 @@ + $(FSharpNetCoreProductTargetFramework) + true + LatestMajor ++ $(NoWarn);64;1182;1204 + + + +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);75 + $(NoWarn);1204 + $(NoWarn);NU5125 ++ $(NoWarn);64;1182;1204 ++ $(OtherFlags) --warnaserror-:1182 + FSharp.Compiler.Service + true + $(DefineConstants);COMPILER