Merge pull request #18567 from dotnet/darc-release/dev18.0-09f3a6a8-3f5b-466c-96fb-f96b7c7177a6

[release/dev18.0] Source code updates from dotnet/dotnet

Author: T-Gro

eng/Build.ps1

@@ -294,6 +294,7 @@ function BuildSolution([string] $solutionName, $packSolution) {
 
     $pack = if ($packSolution -eq $False) {""} else {$pack}
 
+    # TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
     MSBuild $toolsetBuildProj `
         $bl `
         /p:Configuration=$configuration `
@@ -302,6 +303,7 @@ function BuildSolution([string] $solutionName, $packSolution) {
         /p:Restore=$restore `
         /p:Build=$build `
         /p:DotNetBuildRepo=$productBuild `
+        /p:DotNetBuild=$productBuild `
         /p:Rebuild=$rebuild `
         /p:Pack=$pack `
         /p:Sign=$sign `

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="ad8565092bbfdd5c8b4a94a718d10b2d394f7aee" BarId="268384" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="a4d6fdc935d5da12efb00a0b3b693ff1439e0b41" BarId="269082" />
   <ProductDependencies>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25223.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

eng/build.sh

@@ -289,14 +289,17 @@ function BuildSolution {
     fi
 
     BuildMessage="Error building tools"
-    local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:DotNetBuildRepo=$product_build /p:DotNetBuildSourceOnly=$source_build $properties"
+    # TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
+    local args=" publish $repo_root/proto.proj $blrestore $bltools /p:Configuration=Proto /p:DotNetBuildRepo=$product_build /p:DotNetBuild=$product_build /p:DotNetBuildSourceOnly=$source_build $properties"
     echo $args
     "$DOTNET_INSTALL_DIR/dotnet" $args  #$args || exit $?
   fi
 
   if [[ "$skip_build" != true ]]; then
     # do real build
     BuildMessage="Error building solution"
+
+    # TODO: Remove DotNetBuildRepo property when fsharp is on Arcade 10
     MSBuild $toolset_build_proj \
       $bl \
       /p:Configuration=$configuration \
@@ -314,6 +317,7 @@ function BuildSolution {
       /p:QuietRestoreBinaryLog="$binary_log" \
       /p:BuildNoRealsig=$buildnorealsig \
       /p:DotNetBuildRepo=$product_build \
+      /p:DotNetBuild=$product_build \
       /p:DotNetBuildSourceOnly=$source_build \
       $properties
   fi