From 163c9d03cd85a9cf5b17fdbb5dc8eeffad895afe Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 02:05:16 +0000
Subject: [PATCH 1/3] Backflow from https://github.com/dotnet/dotnet / 0cf6b19
 build 309569

[[ commit created by automation ]]
---
 eng/Build.ps1 |  7 ++++++-
 eng/build.sh  | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/eng/Build.ps1 b/eng/Build.ps1
index 40c32755968..cc93c1e68fc 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -48,6 +48,7 @@ param (
     [switch]$useGlobalNuGetCache = $true,
     [switch]$dontUseGlobalNuGetCache = $false,
     [switch]$warnAsError = $true,
+    [string]$warnNotAsError = "",
     [switch][Alias('test')]$testDesktop,
     [string]$testDesktopBatch = "",
     [switch]$testCoreClr,
@@ -149,6 +150,7 @@ function Print-Usage() {
     Write-Host "  -compressAllMetadata          Build product with compressed metadata"
     Write-Host "  -buildnorealsig               Build product with realsig- (default use realsig+, where necessary)"
     Write-Host "  -verifypackageshipstatus      Verify whether the packages we are building have already shipped to nuget"
+    Write-Host "  -warnNotAsError <codes>       Suppress specific warnings from being treated as errors (semi-colon delimited)"
     Write-Host ""
     Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
 }
@@ -305,6 +307,8 @@ function BuildSolution([string] $solutionName, $packSolution) {
 
     $pack = if ($packSolution -eq $False) {""} else {$pack}
 
+    $msbuildWarnNotAsError = if ($warnAsError -and $warnNotAsError -ne "") { "/warnNotAsError:$warnNotAsError" } else { "" }
+
     MSBuild $toolsetBuildProj `
         $bl `
         /p:Configuration=$configuration `
@@ -327,7 +331,8 @@ function BuildSolution([string] $solutionName, $packSolution) {
         /p:BuildNoRealsig=$buildnorealsig `
         /v:$verbosity `
         $suppressExtensionDeployment `
-        @properties
+        @properties `
+        $msbuildWarnNotAsError
 
     $env:BUILDING_USING_DOTNET=$BUILDING_USING_DOTNET_ORIG
 }
diff --git a/eng/build.sh b/eng/build.sh
index d0d18712417..9a0ed19d046 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -40,6 +40,7 @@ usage()
   echo "  --fromVMR                      Set when building from within the VMR"
   echo "  --buildnorealsig               Build product with realsig- (default use realsig+ where necessary)"
   echo "  --tfm                          Override the default target framework"
+  echo "  --warnNotAsError <codes>       Suppress specific warnings from being treated as errors (semi-colon delimited)"
   echo ""
   echo "Command line arguments starting with '/p:' are passed through to MSBuild."
 }
@@ -80,6 +81,7 @@ product_build=false
 from_vmr=false
 buildnorealsig=true
 properties=""
+warn_not_as_error=""
 docker=false
 args=""
 
@@ -189,6 +191,10 @@ while [[ $# > 0 ]]; do
       tfm=$2
       shift
       ;;
+    --warnnotaserror)
+      warn_not_as_error=$2
+      shift
+      ;;
     /p:*)
       properties+=("$1")
       ;;
@@ -328,6 +334,11 @@ function BuildSolution {
     # do real build
     BuildMessage="Error building solution"
 
+    local msbuild_warn_not_as_error=""
+    if [[ "$warn_not_as_error" != "" && "$warn_as_error" == true ]]; then
+      msbuild_warn_not_as_error="/warnNotAsError:$warn_not_as_error"
+    fi
+
     MSBuild $toolset_build_proj \
       $bl \
       /p:Configuration=$configuration \
@@ -347,7 +358,8 @@ function BuildSolution {
       /p:DotNetBuild=$product_build \
       /p:DotNetBuildSourceOnly=$source_build \
       /p:DotNetBuildFromVMR=$from_vmr \
-      ${properties[@]+"${properties[@]}"}
+      ${properties[@]+"${properties[@]}"} \
+      $msbuild_warn_not_as_error
   fi
 }
 

From 01d38ae1c1caa1a5d639d9a78f44972322adf693 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 02:05:16 +0000
Subject: [PATCH 2/3] Update dependencies from build 309569 No dependency
 updates to commit [[ commit created by automation ]]

---
 eng/Version.Details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3453cbc4a62..422144a0a65 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="1a405c76db678301b6f6f5b22d2a63a152c26b97" BarId="309188" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2" BarId="309569" />
   <ProductDependencies>
     <Dependency Name="Microsoft.Build" Version="18.6.0-preview-26180-08">
       <Uri>https://github.com/dotnet/msbuild</Uri>

From 8f94e39e0636a1f45eee715814d4a8153a020cd4 Mon Sep 17 00:00:00 2001
From: Tomas Grosup <tomasgrosup@microsoft.com>
Date: Fri, 10 Apr 2026 12:09:13 +0200
Subject: [PATCH 3/3] Fix CI failures: bump FSBuildVersion to 101

The packages FSharp.Core 11.0.100 and FSharp.Compiler.Service 43.12.100
have already been published to NuGet. Bump FSBuildVersion from 100 to 101
to match main and avoid the version collision.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a5802082fb8..8248454c00f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,7 +19,7 @@
     <!-- F# Version components -->
     <FSMajorVersion>11</FSMajorVersion>
     <FSMinorVersion>0</FSMinorVersion>
-    <FSBuildVersion>100</FSBuildVersion>
+    <FSBuildVersion>101</FSBuildVersion>
     <FSRevisionVersion>0</FSRevisionVersion>
     <!-- -->
     <!-- F# Language version -->