Merge from dev18 to main

Directory.Build.props

@@ -8,6 +8,8 @@
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
     <FSharpNetCoreProductDefaultTargetFramework>net9.0</FSharpNetCoreProductDefaultTargetFramework>
     <IgnoreMibc Condition="'$(IgnoreMibc)' == ''">$(DotNetBuildSourceOnly)</IgnoreMibc>
+    <!-- When building the .NET product, there's no need to publish Windows PDBs. Any conversion to Windows PDBs will be done during staging, if necessary. -->
+    <PublishWindowsPdb Condition="'$(DotNetBuild)' == 'true'">false</PublishWindowsPdb>
   </PropertyGroup>
 
   <!--
@@ -72,7 +74,7 @@
          we should also support $(NetPrevious) for all releases.
          This will likely include FCS and FSharp.Core as well as shipped products.
          Right now, it only covers products we ship (FSC and FSI), not NuGet packages. -->
-    <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'">
+    <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' == 'true'">
       <PropertyGroup>
         <FSharpNetCoreProductTargetFramework>$(NetCurrent)</FSharpNetCoreProductTargetFramework>
       </PropertyGroup>

build.sh

@@ -13,4 +13,4 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-time "$scriptroot/eng/build.sh" --build --restore $@
+time "$scriptroot/eng/build.sh" --build --restore "$@"

eng/Build.ps1

@@ -69,6 +69,7 @@ param (
     [string]$officialSkipTests = "false",
     [switch]$noVisualStudio,
     [switch][Alias('pb')]$productBuild,
+    [switch]$fromVMR,
     [switch]$skipBuild,
     [switch]$compressAllMetadata,
     [switch]$buildnorealsig = $true,
@@ -135,6 +136,7 @@ function Print-Usage() {
     Write-Host "  -dontUseGlobalNuGetCache      Do not use the global NuGet cache"
     Write-Host "  -noVisualStudio               Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
     Write-Host "  -productBuild                 Build the repository in product-build mode."
+    Write-Host "  -fromVMR                      Set when building from within the VMR."
     Write-Host "  -skipbuild                    Skip building product"
     Write-Host "  -compressAllMetadata          Build product with compressed metadata"
     Write-Host "  -buildnorealsig               Build product with realsig- (default use realsig+, where necessary)"
@@ -302,7 +304,8 @@ function BuildSolution([string] $solutionName, $packSolution) {
         /p:RepoRoot=$RepoRoot `
         /p:Restore=$restore `
         /p:Build=$build `
-        /p:DotNetBuildRepo=$productBuild `
+        /p:DotNetBuild=$productBuild `
+        /p:DotNetBuildFromVMR=$fromVMR `
         /p:Rebuild=$rebuild `
         /p:Pack=$pack `
         /p:Sign=$sign `

eng/Version.Details.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="57b0396ae0d21b9f0dfe0d208c57822fb88f9a8d" BarId="269724" />
   <ProductDependencies>
     <Dependency Name="Microsoft.Build" Version="17.15.0-preview-25278-01">
       <Uri>https://github.com/dotnet/msbuild</Uri>

eng/Versions.props

@@ -9,7 +9,10 @@
   </PropertyGroup>
   <!-- Version number computation -->
   <PropertyGroup>
-    <PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
+    <!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
+         the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
+    <FSharpPreReleaseIteration>6</FSharpPreReleaseIteration>
+    <PreReleaseVersionLabel>preview$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
     <!-- These have to be in sync with latest release branch -->
     <!-- F# Version components -->
     <FSMajorVersion>10</FSMajorVersion>
@@ -25,7 +28,7 @@
     <FSCorePackageVersionValue>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCorePackageVersionValue>
     <FSCoreVersionPrefix>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCoreVersionPrefix>
     <FSCoreVersion>$(FSMajorVersion).$(FSMinorVersion).0.0</FSCoreVersion>
-    <FSCoreShippedVersion>9.0.0.0</FSCoreShippedVersion>
+    <FSCoreShippedVersion>10.0.0.0</FSCoreShippedVersion>
     <!-- -->
     <!-- FSharp.Compiler.Service version -->
     <FCSMajorVersion>43</FCSMajorVersion>
@@ -43,8 +46,8 @@
     <FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
     <!-- -->
     <!-- FSharp tools for Visual Studio version number -->
-    <FSToolsMajorVersion>13</FSToolsMajorVersion>
-    <FSToolsMinorVersion>9</FSToolsMinorVersion>
+    <FSToolsMajorVersion>14</FSToolsMajorVersion>
+    <FSToolsMinorVersion>0</FSToolsMinorVersion>
     <FSToolsBuildVersion>$(FSBuildVersion)</FSToolsBuildVersion>
     <FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
     <FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>

eng/build.sh

@@ -37,6 +37,7 @@ usage()
   echo "  --prepareMachine               Prepare machine for CI run, clean up processes after build"
   echo "  --sourceBuild                  Build the repository in source-only mode."
   echo "  --productBuild                 Build the repository in product-build mode."
+  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 ""
@@ -75,10 +76,10 @@ skip_build=false
 prepare_machine=false
 source_build=false
 product_build=false
+from_vmr=false
 buildnorealsig=true
 testbatch=""
 properties=""
-
 docker=false
 args=""
 
@@ -176,6 +177,9 @@ while [[ $# > 0 ]]; do
     --productbuild|--product-build|-pb)
       product_build=true
       ;;
+    --fromvmr|--from-vmr)
+      from_vmr=true
+      ;;
     --buildnorealsig)
       buildnorealsig=true
       ;;
@@ -184,7 +188,7 @@ while [[ $# > 0 ]]; do
       shift
       ;;
     /p:*)
-      properties="$properties $1"
+      properties+=("$1")
       ;;
     *)
       echo "Invalid argument: $1"
@@ -303,14 +307,15 @@ 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"
+    local args=("publish" "$repo_root/proto.proj" "$blrestore" "$bltools" "/p:Configuration=Proto" "/p:DotNetBuild=$product_build" "/p:DotNetBuildSourceOnly=$source_build" "/p:DotNetBuildFromVMR=$from_vmr" ${properties[@]+"${properties[@]}"})
     echo $args
-    "$DOTNET_INSTALL_DIR/dotnet" $args  #$args || exit $?
+    "$DOTNET_INSTALL_DIR/dotnet" "${args[@]}"  #$args || exit $?
   fi
 
   if [[ "$skip_build" != true ]]; then
     # do real build
     BuildMessage="Error building solution"
+
     MSBuild $toolset_build_proj \
       $bl \
       /p:Configuration=$configuration \
@@ -327,9 +332,10 @@ function BuildSolution {
       /p:QuietRestore=$quiet_restore \
       /p:QuietRestoreBinaryLog="$binary_log" \
       /p:BuildNoRealsig=$buildnorealsig \
-      /p:DotNetBuildRepo=$product_build \
+      /p:DotNetBuild=$product_build \
       /p:DotNetBuildSourceOnly=$source_build \
-      $properties
+      /p:DotNetBuildFromVMR=$from_vmr \
+      ${properties[@]+"${properties[@]}"}
   fi
 }