Merge branch 'main' into darc-main-d813792c-eeee-4e40-9f7c-567a78c653dd

2023-10-19 14:18:59 -05:00 · 2023-10-19 14:18:59 -05:00 · 4c34036569
commit 4c34036569
parent a14b6dd7b4 1ae8485fe0
30 changed files with 917 additions and 46 deletions
--- a/NuGet.config
+++ b/NuGet.config
@ -7,6 +7,7 @@
    <clear />
    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-pub-DotNet-msbuild-Trusted-6cdef42" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6cdef424/nuget/v3/index.json" />
    <!--  End: Package sources from DotNet-msbuild-Trusted -->
    <!--  Begin: Package sources from dotnet-sdk -->
    <!--  End: Package sources from dotnet-sdk -->
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -202,18 +202,18 @@
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
+      <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23510.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
+      <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23463.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23510.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d451c32dda2314c721adbf8829e1c0cd4e681ff</Sha>
+      <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23430.3">
      <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -232,9 +232,9 @@
      <Sha>26ce96327dd346534926c4551f8b8d62a6fc724f</Sha>
      <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23509.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
-      <Sha>194f32828726c3f1f63f79f3dc09b9e99c157b11</Sha>
+      <Sha>4f761bf529f4be49842b13d7efcef9af87f0a973</Sha>
      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
    </Dependency>
    <Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="8.0.0-preview.23424.2">
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -39,7 +39,7 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23463.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23510.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/arcade-services -->
--- a/eng/common/post-build/check-channel-consistency.ps1
+++ b/eng/common/post-build/check-channel-consistency.ps1
@ -7,7 +7,7 @@ try {
  . $PSScriptRoot\post-build-utils.ps1

  if ($PromoteToChannels -eq "") {
-    Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
+    Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
    ExitWithExitCode 0
  }

--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@ -64,7 +64,7 @@ try {
      $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
    }
    if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty
    }
    if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
        $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
  }

  # Minimum VS version to require.
-  $vsMinVersionReqdStr = '17.6'
+  $vsMinVersionReqdStr = '17.7'
  $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr)

  # If the version of msbuild is going to be xcopied,
  # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2
-  $defaultXCopyMSBuildVersion = '17.6.0-2'
+  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1
+  $defaultXCopyMSBuildVersion = '17.7.2-1'

  if (!$vsRequirements) {
    if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
--- a/eng/pipelines/vmr-build.yml
+++ b/eng/pipelines/vmr-build.yml
@ -4,6 +4,10 @@ pr:
    include:
    - main
    - release/*
+    exclude:
+    - release/*.0.2xx
+    - release/*.0.3xx
+    - release/*.0.4xx

 parameters:
 - name: vmrBranch
--- a/eng/pipelines/vmr-sync-internal.yml
+++ b/eng/pipelines/vmr-sync-internal.yml
@ -5,6 +5,10 @@ trigger:
  branches:
    include:
    - internal/release/*
+    exclude:
+    - internal/release/*.0.2xx
+    - internal/release/*.0.3xx
+    - internal/release/*.0.4xx

 resources:
  repositories:
--- a/global.json
+++ b/global.json
@ -12,7 +12,7 @@
    "cmake": "3.21.0"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
-    "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23463.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4",
+    "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23510.4"
  }
 }
--- a/src/SourceBuild/content/build.proj
+++ b/src/SourceBuild/content/build.proj
@ -7,6 +7,10 @@

  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

+  <PropertyGroup>
+    <SkipErrorOnPrebuilts>true</SkipErrorOnPrebuilts>
+  </PropertyGroup>
+
  <Target Name="Build" DependsOnTargets="PrepareOutput;InitBuild">
    <Message Text="Build Environment: $(Platform) $(Configuration) $(TargetOS) $(TargetRid)" />

--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@ -32,6 +32,6 @@
    -->
    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
    <PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
-    <PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-1.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
+    <PrivateSourceBuiltPrebuiltsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Prebuilts.0.1.0-9.0.100-3.centos.8-x64.tar.gz</PrivateSourceBuiltPrebuiltsUrl>
  </PropertyGroup>
 </Project>
--- a/src/SourceBuild/content/eng/pipelines/ci.yml
+++ b/src/SourceBuild/content/eng/pipelines/ci.yml
@ -7,6 +7,13 @@ trigger:
    - main
    - release/*
    - internal/release/*
+    exclude:
+    - release/*.0.2xx
+    - release/*.0.3xx
+    - release/*.0.4xx
+    - internal/release/*.0.2xx
+    - internal/release/*.0.3xx
+    - internal/release/*.0.4xx

 pr:
  branches:
--- a/src/SourceBuild/content/prep.sh
+++ b/src/SourceBuild/content/prep.sh
@ -157,6 +157,9 @@ function BootstrapArtifacts {
 if [ "$installDotnet" == true ]; then
  echo "  Installing dotnet..."
  (source ./eng/common/tools.sh && InitializeDotNetCli true)
+
+  # TODO: Remove once runtime dependency is gone (https://github.com/dotnet/runtime/issues/93666)
+  bash .dotnet/dotnet-install.sh --install-dir "$SCRIPT_ROOT/.dotnet" --channel 8.0 --runtime dotnet
 fi

 # Read the eng/Versions.props to get the archives to download and download them
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ArtifactsSizeTest.cs
@ -16,7 +16,7 @@ using Xunit.Abstractions;
 namespace Microsoft.DotNet.SourceBuild.SmokeTests;

 [Trait("Category", "SdkContent")]
-public class ArtifactsSizeTest : SmokeTests
+public class ArtifactsSizeTest : SdkTests
 {
    private const int SizeThresholdPercentage = 25;
    private static readonly string BaselineFilePath = BaselineHelper.GetBaselineFilePath($"ArtifactsSizes/{Config.TargetRid}.txt");
@ -41,7 +41,8 @@ public class ArtifactsSizeTest : SmokeTests
    }


-    [SkippableFact(Config.IncludeArtifactsSizeEnv, skipOnFalseEnv: true)]
+    // https://github.com/dotnet/source-build/issues/3668
+    //[SkippableFact(Config.IncludeArtifactsSizeEnv, skipOnFalseEnv: true)]
    public void CompareArtifactsToBaseline()
    {
        Utilities.ValidateNotNullOrWhiteSpace(Config.SourceBuiltArtifactsPath, Config.SourceBuiltArtifactsPathEnv);
@ -64,7 +65,7 @@ public class ArtifactsSizeTest : SmokeTests

        try
        {
-            string actualFilePath = Path.Combine(DotNetHelper.LogsDirectory, $"UpdatedArtifactsSizes_{Config.TargetRid}.txt");
+            string actualFilePath = Path.Combine(LogsDirectory, $"UpdatedArtifactsSizes_{Config.TargetRid}.txt");
            File.WriteAllLines(actualFilePath, tarEntries.Select(entry => $"{entry.FilePath}: {entry.Bytes}"));
        }
        catch (IOException ex)
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
@ -19,8 +19,9 @@ public class BasicScenarioTests : SdkTests
 {
    public BasicScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { }

-    [Theory]
-    [MemberData(nameof(GetScenarioObjects))]
+    // https://github.com/dotnet/source-build/issues/3668
+    // [Theory]
+    // [MemberData(nameof(GetScenarioObjects))]
    public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper);

    public static IEnumerable<object[]> GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario });
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs
@ -21,7 +21,8 @@ public class DebugTests : SdkTests
    /// <Summary>
    /// Verifies that all generated native files include native debug symbols.
    /// </Summary>
-    [Fact]
+    // https://github.com/dotnet/source-build/issues/3668
+    //[Fact]
    public void SourceBuiltSdkContainsNativeDebugSymbols()
    {

--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetWatchTests.cs
@ -13,7 +13,8 @@ public class DotNetWatchTests : SdkTests
 {
    public DotNetWatchTests(ITestOutputHelper outputHelper) : base(outputHelper) { }

-    [Fact]
+    // https://github.com/dotnet/source-build/issues/3668
+    //[Fact]
    public void WatchTests()
    {
        string projectDirectory = DotNetHelper.ExecuteNew(DotNetTemplate.Console.GetName(), nameof(DotNetWatchTests));
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/LicenseScanTests.cs
@ -136,7 +136,8 @@ public class LicenseScanTests : TestBase
        _targetRepo = new DirectoryInfo(Config.LicenseScanPath).Name;
    }

-    [SkippableFact(Config.LicenseScanPathEnv, skipOnNullOrWhiteSpaceEnv: true)]
+    // https://github.com/dotnet/source-build/issues/3668
+    //[SkippableFact(Config.LicenseScanPathEnv, skipOnNullOrWhiteSpaceEnv: true)]
    public void ScanForLicenses()
    {
        Assert.NotNull(Config.LicenseScanPath);
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj
@ -11,8 +11,8 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="7.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="xunit" Version="2.5.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs
@ -25,18 +25,19 @@ public class OmniSharpTests : SdkTests

    public OmniSharpTests(ITestOutputHelper outputHelper) : base(outputHelper) { }

-    [SkippableTheory(Config.ExcludeOmniSharpEnv, skipOnTrueEnv: true, skipArchitectures: new[] { "ppc64le", "s390x" })]
-    [InlineData(DotNetTemplate.BlazorWasm)]
-    [InlineData(DotNetTemplate.ClassLib)]
-    [InlineData(DotNetTemplate.Console)]
-    [InlineData(DotNetTemplate.MSTest)]
-    [InlineData(DotNetTemplate.Mvc)]
-    [InlineData(DotNetTemplate.NUnit)]
-    [InlineData(DotNetTemplate.Web)]
-    [InlineData(DotNetTemplate.WebApp)]
-    [InlineData(DotNetTemplate.WebApi)]
-    [InlineData(DotNetTemplate.Worker)]
-    [InlineData(DotNetTemplate.XUnit)]
+    // https://github.com/dotnet/source-build/issues/3668
+    // [SkippableTheory(Config.ExcludeOmniSharpEnv, skipOnTrueEnv: true, skipArchitectures: new[] { "ppc64le", "s390x" })]
+    // [InlineData(DotNetTemplate.BlazorWasm)]
+    // [InlineData(DotNetTemplate.ClassLib)]
+    // [InlineData(DotNetTemplate.Console)]
+    // [InlineData(DotNetTemplate.MSTest)]
+    // [InlineData(DotNetTemplate.Mvc)]
+    // [InlineData(DotNetTemplate.NUnit)]
+    // [InlineData(DotNetTemplate.Web)]
+    // [InlineData(DotNetTemplate.WebApp)]
+    // [InlineData(DotNetTemplate.WebApi)]
+    // [InlineData(DotNetTemplate.Worker)]
+    // [InlineData(DotNetTemplate.XUnit)]
    public async void VerifyScenario(DotNetTemplate template)
    {
        await InitializeOmniSharp();
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/PoisonTests.cs
@ -12,8 +12,9 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests
    public class PoisonTests : SdkTests
    {
        public PoisonTests(ITestOutputHelper outputHelper) : base(outputHelper) { }
-
-        [SkippableFact(Config.PoisonReportPathEnv, skipOnNullOrWhiteSpaceEnv: true)]
+        
+        // https://github.com/dotnet/source-build/issues/3668
+        // [SkippableFact(Config.PoisonReportPathEnv, skipOnNullOrWhiteSpaceEnv: true)]
        public void VerifyUsage()
        {
            if (!File.Exists(Config.PoisonReportPath))
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs
@ -31,7 +31,8 @@ public class SdkContentTests : SdkTests
    /// This makes the baseline durable between releases.  This does mean however, entries
    /// in the baseline may appear identical if the diff is version specific.
    /// </Summary>
-    [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)]
+    // https://github.com/dotnet/source-build/issues/3668
+    //[SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)]
    public void CompareMsftToSbFileList()
    {
        const string msftFileListingFileName = "msftSdkFiles.txt";
@ -44,7 +45,8 @@ public class SdkContentTests : SdkTests
        BaselineHelper.CompareBaselineContents("MsftToSbSdkFiles.diff", diff, OutputHelper, Config.WarnOnSdkContentDiffs);
    }

-    [SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)]
+    // https://github.com/dotnet/source-build/issues/3668
+    //[SkippableFact(new[] { Config.MsftSdkTarballPathEnv, Config.SdkTarballPathEnv }, skipOnNullOrWhiteSpaceEnv: true)]
    public void CompareMsftToSbAssemblyVersions()
    {
        Assert.NotNull(Config.MsftSdkTarballPath);
--- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs
+++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs
@ -20,8 +20,9 @@ public class WebScenarioTests : SdkTests
 {
    public WebScenarioTests(ITestOutputHelper outputHelper) : base(outputHelper) { }

-    [Theory]
-    [MemberData(nameof(GetScenarioObjects))]
+    // https://github.com/dotnet/source-build/issues/3668
+    // [Theory]
+    // [MemberData(nameof(GetScenarioObjects))]
    public void VerifyScenario(TestScenario scenario) => scenario.Execute(DotNetHelper);

    public static IEnumerable<object[]> GetScenarioObjects() => GetScenarios().Select(scenario => new object[] { scenario });
--- a/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch
+++ b/src/SourceBuild/patches/format/0001-Explicitly-set-TFM-to-net9.0.patch
@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Wed, 18 Oct 2023 12:50:21 -0500
+Subject: [PATCH] Explicitly set TFM to net9.0
+
+Backport: https://github.com/dotnet/source-build/issues/3663
+---
+ perf/dotnet-format.Performance.csproj | 2 +-
+ src/dotnet-format.csproj              | 2 +-
+ tests/dotnet-format.UnitTests.csproj  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj
+index 677b7b9a..3e1387d1 100644
+--- a/perf/dotnet-format.Performance.csproj
+++ b/perf/dotnet-format.Performance.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <OutputType>Exe</OutputType>
+     <Optimize>true</Optimize>
+     <Configuration>Release</Configuration>
+diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
+index 5549fb71..8a77d03f 100644
+--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <OutputType>Exe</OutputType>
+     <RootNamespace>Microsoft.CodeAnalysis.Tools</RootNamespace>
+     <ServerGarbageCollection>true</ServerGarbageCollection>
+diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj
+index c4311a1a..5b1bcfb9 100644
+--- a/tests/dotnet-format.UnitTests.csproj
+++ b/tests/dotnet-format.UnitTests.csproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <RootNamespace>Microsoft.CodeAnalysis.Tools.Tests</RootNamespace>
+ 
+     <!-- Copy nuget assemblies to build directory so that Microsoft.CodeAnalysis.Features.* can be located when running tests. -->
--- a/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch
+++ b/src/SourceBuild/patches/format/0002-Update-Microsoft.Build.Locator-to-1.6.10.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Wed, 18 Oct 2023 13:05:45 -0500
+Subject: [PATCH] Update Microsoft.Build.Locator to 1.6.10
+
+Backport: https://github.com/dotnet/sdk/issues/36219
+---
+ eng/Versions.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/Versions.props b/eng/Versions.props
+index 961660e5..c330813b 100644
+--- a/eng/Versions.props
+++ b/eng/Versions.props
+@@ -40,7 +40,7 @@
+     <!-- external -->
+     <BenchmarkDotNetVersion>0.13.5</BenchmarkDotNetVersion>
+     <BenchmarkDotNetAnnotationsVersion>0.13.5</BenchmarkDotNetAnnotationsVersion>
+-    <MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
+    <MicrosoftBuildLocatorVersion>1.6.10</MicrosoftBuildLocatorVersion>
+     <MicrosoftVisualStudioCompositionVersion>17.4.16</MicrosoftVisualStudioCompositionVersion>
+   </PropertyGroup>
+ </Project>
--- a/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch
+++ b/src/SourceBuild/patches/fsharp/0001-Explicitly-set-net9.0-TFM.patch
@ -0,0 +1,640 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Thu, 19 Oct 2023 08:33:01 -0500
+Subject: [PATCH] Explicitly use net9.0 TFM
+
+Backport: https://github.com/dotnet/source-build/issues/3663
+---
+ Directory.Build.props                         |  4 +--
+ buildtools/AssemblyCheck/AssemblyCheck.fsproj |  2 +-
+ .../FSharp.Compiler.Service_notshipped.fsproj |  2 +-
+ buildtools/fslex/fslex.fsproj                 |  2 +-
+ buildtools/fsyacc/fsyacc.fsproj               |  2 +-
+ eng/build.sh                                  |  6 ++--
+ .../EditorService/EditorService.fsproj        |  2 +-
+ src/Compiler/FSharp.Compiler.Service.fsproj   |  6 ++--
+ .../Microsoft.FSharp.Compiler.fsproj          |  2 +-
+ .../Microsoft.FSharp.Compiler.nuspec          | 28 +++++++++----------
+ src/fsc/fscProject/fsc.fsproj                 |  6 ++--
+ src/fsi/fsiProject/fsi.fsproj                 |  6 ++--
+ .../SelfContained_Trimming_Test.fsproj        |  6 ++--
+ ...taticLinkedFSharpCore_Trimming_Test.fsproj |  6 ++--
+ .../BasicProvider.DesignTime.fsproj           |  2 +-
+ .../BasicProvider.Tests.fsproj                |  2 +-
+ .../BasicProvider/BasicProvider.fsproj        |  2 +-
+ .../FSharp.Build.UnitTests.fsproj             |  4 +--
+ .../FSharp.Compiler.ComponentTests.fsproj     |  4 +--
+ ...ompiler.Private.Scripting.UnitTests.fsproj |  4 +--
+ .../FSharp.Compiler.Service.Tests.fsproj      |  4 +--
+ .../FSharp.Compiler.UnitTests.fsproj          |  4 +--
+ .../FSharp.Core.UnitTests.fsproj              |  4 +--
+ .../FSharp.Test.Utilities.fsproj              |  4 +--
+ .../MicroPerf/MicroPerf.fsproj                |  2 +-
+ .../TaskPerf/TaskPerf/TaskPerf.fsproj         |  2 +-
+ .../TaskPerfPreviousCompiler.fsproj           |  2 +-
+ .../HistoricalBenchmark.Runner.fsproj         |  2 +-
+ .../HistoricalBenchmark.fsproj                |  2 +-
+ .../FSharp.Compiler.Benchmarks.fsproj         |  2 +-
+ .../FCSSourceFiles/FCSSourceFiles.fsproj      |  2 +-
+ .../Fsharp.ProfilingStartpointProject.fsproj  |  2 +-
+ tests/fsharp/FSharpSuite.Tests.fsproj         |  4 +--
+ .../Sample_ConsoleApp_net7.fsproj             |  6 ++--
+ .../Sample_ConsoleApp_net7.fsproj             |  6 ++--
+ 35 files changed, 73 insertions(+), 73 deletions(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index 879bd8941..161d115ad 100644
+--- a/Directory.Build.props
+++ b/Directory.Build.props
+@@ -30,8 +30,8 @@
+     <ArtifactsDir>$(MSBuildThisFileDirectory)artifacts/</ArtifactsDir>
+     <OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
+     <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
+-    <FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net8.0/fslex.dll</FsLexPath>
+-    <FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net8.0/fsyacc.dll</FsYaccPath>
+    <FsLexPath>$(ArtifactsDir)/bin/fslex/$(Configuration)/net9.0/fslex.dll</FsLexPath>
+    <FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/net9.0/fsyacc.dll</FsYaccPath>
+   </PropertyGroup>
+ 
+   <Import Project="$(MSBuildThisFileDirectory)/eng/Versions.props" Condition="'$(DISABLE_ARCADE)' == 'true'"/>
+diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
+index 46ffb722c..9d391689d 100644
+--- a/buildtools/AssemblyCheck/AssemblyCheck.fsproj
+++ b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
+   </PropertyGroup>
+diff --git a/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj b/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj
+index 514b1f4dd..d3df3b688 100644
+--- a/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj
+++ b/buildtools/checkpackages/FSharp.Compiler.Service_notshipped.fsproj
+@@ -3,7 +3,7 @@
+   <Import Project="$(MSBuildProjectDirectory)\..\..\eng\Versions.props" />
+  
+   <PropertyGroup>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <CachePath>$(MSBuildProjectDirectory)\..\..\artifacts\tmp\$([System.Guid]::NewGuid())</CachePath>
+     <OutputPath>$(CachePath)\bin</OutputPath>
+diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
+index 674dde7c7..8764e40e1 100644
+--- a/buildtools/fslex/fslex.fsproj
+++ b/buildtools/fslex/fslex.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
+     <RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
+diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
+index fc072b7cf..4110186e5 100644
+--- a/buildtools/fsyacc/fsyacc.fsproj
+++ b/buildtools/fsyacc/fsyacc.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
+     <RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
+diff --git a/eng/build.sh b/eng/build.sh
+index 3b992d6bf..3a4444081 100755
+--- a/eng/build.sh
+++ b/eng/build.sh
+@@ -264,8 +264,8 @@ function BuildSolution {
+       MSBuild "$repo_root/buildtools/buildtools.proj" /restore "$bltools" /p:Configuration=$bootstrap_config
+ 
+       mkdir -p "$bootstrap_dir"
+-      cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net8.0 $bootstrap_dir/fslex
+-      cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net8.0 $bootstrap_dir/fsyacc
+      cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net9.0 $bootstrap_dir/fslex
+      cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net9.0 $bootstrap_dir/fsyacc
+     fi
+     if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
+       local bltools=""
+@@ -274,7 +274,7 @@ function BuildSolution {
+       fi
+       BuildMessage="Error building bootstrap"
+       MSBuild "$repo_root/Proto.sln" /restore "$bltools" /p:Configuration=$bootstrap_config
+-      cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net8.0 $bootstrap_dir/fsc
+      cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net9.0 $bootstrap_dir/fsc
+     fi
+   fi
+ 
+diff --git a/fcs-samples/EditorService/EditorService.fsproj b/fcs-samples/EditorService/EditorService.fsproj
+index e4103999f..fe08d0cc4 100644
+--- a/fcs-samples/EditorService/EditorService.fsproj
+++ b/fcs-samples/EditorService/EditorService.fsproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <Import Project="..\..\netfx.props" />
+   <PropertyGroup>
+-    <TargetFrameworks>$(FcsTargetNetFxFramework);net8.0</TargetFrameworks>
+    <TargetFrameworks>$(FcsTargetNetFxFramework);net9.0</TargetFrameworks>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <OutputType>Exe</OutputType>
+     <IsPackable>false</IsPackable>
+diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
+index 45ae22a3e..56a587c30 100644
+--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
+@@ -521,15 +521,15 @@
+   <ItemGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
+     <!-- We are setting TFM explicitly here, since we are only using fslexyacc's dlls in msbuild -->
+     <ProjectReference Include="$(RepoRoot)\buildtools\fslex\fslex.fsproj" ReferenceOutputAssembly="False">
+-      <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net9.0</SetTargetFramework>
+       <ExcludeAssets>compile</ExcludeAssets>
+     </ProjectReference>
+     <ProjectReference Include="$(RepoRoot)\buildtools\fsyacc\fsyacc.fsproj" ReferenceOutputAssembly="False">
+-      <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net9.0</SetTargetFramework>
+       <ExcludeAssets>compile</ExcludeAssets>
+     </ProjectReference>
+     <ProjectReference Include="$(RepoRoot)\buildtools\AssemblyCheck\AssemblyCheck.fsproj" ReferenceOutputAssembly="False">
+-      <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net9.0</SetTargetFramework>
+       <ExcludeAssets>compile</ExcludeAssets>
+     </ProjectReference>
+   </ItemGroup>
+diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
+index f7560b707..68b02ce25 100644
+--- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
+++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
+@@ -3,7 +3,7 @@
+   <PropertyGroup>
+     <PreRelease>true</PreRelease>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <NuspecFile>Microsoft.FSharp.Compiler.nuspec</NuspecFile>
+     <IsPackable>true</IsPackable>
+     <PackageDescription>.NET Core compatible version of the F# compiler fsc.exe.</PackageDescription>
+diff --git a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
+index ca36309d5..e567e478b 100644
+--- a/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
+++ b/src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
+@@ -4,7 +4,7 @@
+         $CommonMetadataElements$
+         <language>en-US</language>
+         <dependencies>
+-            <group targetFramework=".net8.0" />
+            <group targetFramework=".net9.0" />
+         </dependencies>
+         <contentFiles>
+             <files include="any\any\default.win32manifest"                       buildAction="Content" copyToOutput="true" flatten="false" />
+@@ -26,16 +26,16 @@
+             this approach gives a very small deployment. Which is kind of necessary.
+         -->
+         <!-- assemblies -->
+-        <file src="fsc\ReleaseCompressed\net8.0\fsc.dll"                                                     target="lib\net8.0" />
+-        <file src="fsi\ReleaseCompressed\net8.0\fsi.dll"                                                     target="lib\net8.0" />
+-        <file src="FSharp.Core\ReleaseCompressed\netstandard2.0\FSharp.Core.dll"                             target="lib\net8.0" />
+-        <file src="FSharp.Core\ReleaseCompressed\netstandard2.0\FSharp.Core.xml"                             target="lib\net8.0" />
+-        <file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\FSharp.Compiler.Service.dll"     target="lib\net8.0" />
+-        <file src="FSharp.Build\ReleaseCompressed\netstandard2.0\FSharp.Build.dll"                           target="lib\net8.0" />
+        <file src="fsc\ReleaseCompressed\net9.0\fsc.dll"                                                     target="lib\net9.0" />
+        <file src="fsi\ReleaseCompressed\net9.0\fsi.dll"                                                     target="lib\net9.0" />
+        <file src="FSharp.Core\ReleaseCompressed\netstandard2.0\FSharp.Core.dll"                             target="lib\net9.0" />
+        <file src="FSharp.Core\ReleaseCompressed\netstandard2.0\FSharp.Core.xml"                             target="lib\net9.0" />
+        <file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\FSharp.Compiler.Service.dll"     target="lib\net9.0" />
+        <file src="FSharp.Build\ReleaseCompressed\netstandard2.0\FSharp.Build.dll"                           target="lib\net9.0" />
+         <file src="FSharp.DependencyManager.Nuget\ReleaseCompressed\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
+-                                                                                                             target="lib\net8.0" />
+                                                                                                             target="lib\net9.0" />
+         <file src="FSharp.Compiler.Interactive.Settings\ReleaseCompressed\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
+-                                                                                                             target="lib\net8.0" />
+                                                                                                             target="lib\net9.0" />
+         <!-- additional files -->
+         <file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\default.win32manifest"           target="contentFiles\any\any" />
+         <file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.FSharp.Targets"                   target="contentFiles\any\any" />
+@@ -45,14 +45,14 @@
+         <file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets"  target="contentFiles\any\any" />
+ 
+         <!-- resources -->
+-        <file src="FSharp.Core\ReleaseCompressed\netstandard2.0\**\FSharp.Core.resources.dll"                target="lib\net8.0" />
+        <file src="FSharp.Core\ReleaseCompressed\netstandard2.0\**\FSharp.Core.resources.dll"                target="lib\net9.0" />
+         <file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\**\FSharp.Compiler.Service.resources.dll"
+-                                                                                                             target="lib\net8.0" />
+                                                                                                             target="lib\net9.0" />
+         <file src="FSharp.Compiler.Interactive.Settings\ReleaseCompressed\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
+-                                                                                                             target="lib\net8.0" />
+-        <file src="FSharp.Build\ReleaseCompressed\netstandard2.0\**\FSharp.Build.resources.dll"              target="lib\net8.0" />
+                                                                                                             target="lib\net9.0" />
+        <file src="FSharp.Build\ReleaseCompressed\netstandard2.0\**\FSharp.Build.resources.dll"              target="lib\net9.0" />
+         <file src="FSharp.DependencyManager.Nuget\ReleaseCompressed\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
+-                                                                                                             target="lib\net8.0" />
+                                                                                                             target="lib\net9.0" />
+         <file src="$artifactsPackagesDir$Dependency\Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg"
+                                                                                                              target="contentFiles\Shipping" />
+         <file src="$artifactsPackagesDir$Dependency\Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg"    target="contentFiles\Release" />
+diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj
+index 64c4651a7..985f1492b 100644
+--- a/src/fsc/fscProject/fsc.fsproj
+++ b/src/fsc/fscProject/fsc.fsproj
+@@ -3,15 +3,15 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup Condition="'$(BUILD_PROTO)' != 'true'">
+-    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
+     <Configurations>Debug;Release;Proto;ReleaseCompressed</Configurations>
+   </PropertyGroup>
+ 
+   <PropertyGroup Condition="'$(BUILD_PROTO)' == 'true'">
+     <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
+   </PropertyGroup>
+ 
+diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj
+index dd17f8bd5..6bfa01c3e 100644
+--- a/src/fsi/fsiProject/fsi.fsproj
+++ b/src/fsi/fsiProject/fsi.fsproj
+@@ -3,15 +3,15 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup Condition="'$(BUILD_PROTO)' != 'true'">
+-    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
+     <Configurations>Debug;Release;Proto;ReleaseCompressed</Configurations>
+   </PropertyGroup>
+ 
+   <PropertyGroup Condition="'$(BUILD_PROTO)' == 'true'">
+     <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
+   </PropertyGroup>
+ 
+diff --git a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
+index cb02b7e0f..acd4e8f10 100644
+--- a/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
+++ b/tests/AheadOfTime/Trimming/SelfContained_Trimming_Test/SelfContained_Trimming_Test.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
+     <LangVersion>preview</LangVersion>
+     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+     <DotNetBuildOffline>true</DotNetBuildOffline>
+@@ -17,8 +17,8 @@
+   </PropertyGroup>
+ 
+   <PropertyGroup>
+-    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll</DotnetFscCompilerPath>
+-    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll</DotnetFscCompilerPath>
+    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+     <FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
+     <FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
+   </PropertyGroup>
+diff --git a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
+index d36faf2c0..2004fafbe 100644
+--- a/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
+++ b/tests/AheadOfTime/Trimming/StaticLinkedFSharpCore_Trimming_Test/StaticLinkedFSharpCore_Trimming_Test.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0</TargetFrameworks>
+     <LangVersion>preview</LangVersion>
+     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+     <DotNetBuildOffline>true</DotNetBuildOffline>
+@@ -19,8 +19,8 @@
+   </PropertyGroup>
+ 
+   <PropertyGroup>
+-    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll</DotnetFscCompilerPath>
+-    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net8.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll</DotnetFscCompilerPath>
+    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../../artifacts/bin/fsc/Release/net9.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+     <FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
+     <FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
+   </PropertyGroup>
+diff --git a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj
+index b05e1882f..53c32b81b 100644
+--- a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj
+++ b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.DesignTime/BasicProvider.DesignTime.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net9.0;net472</TargetFrameworks>
+     <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
+     <DefineConstants>NO_GENERATIVE</DefineConstants>
+     <DefineConstants>IS_DESIGNTIME</DefineConstants>
+diff --git a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj
+index 5da0cbb3b..981441310 100644
+--- a/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj
+++ b/tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net8.0</TargetFramework>
+    <TargetFramework Condition=" '$(TestTargetFramework)' == '' ">net9.0</TargetFramework>
+     <TargetFramework Condition=" '$(TestTargetFramework)' != '' ">$(TestTargetFramework)</TargetFramework>
+     <IsPackable>false</IsPackable>
+     <DefineConstants>NO_GENERATIVE</DefineConstants>
+diff --git a/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj b/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj
+index 96006f066..24c2188c5 100644
+--- a/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj
+++ b/tests/EndToEndBuildTests/BasicProvider/BasicProvider/BasicProvider.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Library</OutputType>
+-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net9.0;net472</TargetFrameworks>
+     <FSharpToolsDirectory>typeproviders</FSharpToolsDirectory>
+     <FSharpCoreImplicitPackageVersion>$(FSharpCoreShippedPackageVersionValue)</FSharpCoreImplicitPackageVersion>
+     <PackagePath>typeproviders</PackagePath>
+diff --git a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
+index e3c796d0b..e4926cd6c 100644
+--- a/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
+++ b/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj
+@@ -3,8 +3,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net9.0</TargetFrameworks>
+     <OutputType>Library</OutputType>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <UnitTestType>xunit</UnitTestType>
+diff --git a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+index aefeb44cc..1d07c4d06 100644
+--- a/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+++ b/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj
+@@ -3,8 +3,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <OutputType>Library</OutputType>
+     <GenerateProgramFile>false</GenerateProgramFile>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+diff --git a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj
+index cdfd467e5..2fdcffc90 100644
+--- a/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj
+++ b/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj
+@@ -2,8 +2,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net9.0</TargetFrameworks>
+     <OutputType>Library</OutputType>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <UnitTestType>xunit</UnitTestType>
+diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
+index 7cb2dfd22..1fa999721 100644
+--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
+++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
+@@ -3,8 +3,8 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <!-- Workaround to get rid of:
+         error NU1505: Duplicate 'PackageDownload' items found.
+         Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior.
+diff --git a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
+index 915332ac4..b0064bd9d 100644
+--- a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
+++ b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj
+@@ -3,8 +3,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <OutputType>Library</OutputType>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <DefineConstants>$(DefineConstants);ASSUME_PREVIEW_FSHARP_CORE</DefineConstants>
+diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj b/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
+index 4b6c5c534..1b20371c4 100644
+--- a/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
+++ b/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
+@@ -3,8 +3,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net9.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net9.0</TargetFrameworks>
+     <OutputType>Library</OutputType>
+ 
+     <AssemblyName>FSharp.Core.UnitTests</AssemblyName>
+diff --git a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
+index 03a4d4870..fbbda1930 100644
+--- a/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
+++ b/tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix' or '$(BUILDING_USING_DOTNET)' == 'true'">net9.0</TargetFrameworks>
+     <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
+     <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
+diff --git a/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj b/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
+index 81866aa56..046bebf83 100644
+--- a/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
+++ b/tests/benchmarks/CompiledCodeBenchmarks/MicroPerf/MicroPerf.fsproj
+@@ -1,6 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+   <PropertyGroup>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <OutputType>Exe</OutputType>
+     <!-- Workaround to get rid of:
+         error NU1505: Duplicate 'PackageDownload' items found.
+diff --git a/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj b/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
+index 4d29d42c5..5c89a5fff 100644
+--- a/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
+++ b/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerf/TaskPerf.fsproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <OutputType>Exe</OutputType>
+ 	<!-- Workaround to get rid of:
+         error NU1505: Duplicate 'PackageDownload' items found.
+diff --git a/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerfPreviousCompiler/TaskPerfPreviousCompiler.fsproj b/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerfPreviousCompiler/TaskPerfPreviousCompiler.fsproj
+index b71c47ac8..66b708e7a 100644
+--- a/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerfPreviousCompiler/TaskPerfPreviousCompiler.fsproj
+++ b/tests/benchmarks/CompiledCodeBenchmarks/TaskPerf/TaskPerfPreviousCompiler/TaskPerfPreviousCompiler.fsproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <OutputType>Exe</OutputType>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+ 	<OtherFlags>$(OtherFlags) --define:ASYNC_PERF</OtherFlags>
+diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
+index 13add7032..4bbae272f 100644
+--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
+@@ -1,7 +1,7 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+     <PropertyGroup>
+-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
+         <GenerateDocumentationFile>true</GenerateDocumentationFile>
+         <RootNamespace>HistoricalBenchmark.Utilities</RootNamespace>
+     </PropertyGroup>
+diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
+index a477f61af..7b030bbd0 100644
+--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <Configurations>Release</Configurations>
+     <!-- Workaround to get rid of:
+diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
+index a8c8ff31b..d5c54252f 100644
+--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+     <!-- Workaround to get rid of:
+         error NU1505: Duplicate 'PackageDownload' items found.
+diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
+index 5f0d38af2..ef367627e 100644
+--- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj b/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj
+index 6cb9e4bd7..1ab60ffd4 100644
+--- a/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj
+++ b/tests/benchmarks/Fsharp.ProfilingStartpointProject/Fsharp.ProfilingStartpointProject.fsproj
+@@ -2,7 +2,7 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+   </PropertyGroup>
+ 
+   <ItemGroup>
+diff --git a/tests/fsharp/FSharpSuite.Tests.fsproj b/tests/fsharp/FSharpSuite.Tests.fsproj
+index b6d69d8ae..fff42ac08 100644
+--- a/tests/fsharp/FSharpSuite.Tests.fsproj
+++ b/tests/fsharp/FSharpSuite.Tests.fsproj
+@@ -2,8 +2,8 @@
+ <Project Sdk="Microsoft.NET.Sdk">
+ 
+   <PropertyGroup>
+-    <TargetFrameworks>net472;net8.0</TargetFrameworks>
+-    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net8.0</TargetFrameworks>
+    <TargetFrameworks>net472;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Unix'">net9.0</TargetFrameworks>
+     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81</AssetTargetFallback>
+     <ReferenceVsAssemblies>true</ReferenceVsAssemblies>
+diff --git a/tests/projects/Sample_ConsoleApp_FileSystemTests/Sample_ConsoleApp_net7.fsproj b/tests/projects/Sample_ConsoleApp_FileSystemTests/Sample_ConsoleApp_net7.fsproj
+index 13d42aeb2..36be65589 100644
+--- a/tests/projects/Sample_ConsoleApp_FileSystemTests/Sample_ConsoleApp_net7.fsproj
+++ b/tests/projects/Sample_ConsoleApp_FileSystemTests/Sample_ConsoleApp_net7.fsproj
+@@ -2,13 +2,13 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+   </PropertyGroup>
+ 
+   <PropertyGroup>
+-    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net8.0/fsc.dll</DotnetFscCompilerPath>
+-    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net8.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net9.0/fsc.dll</DotnetFscCompilerPath>
+    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net9.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+     <FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
+     <FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
+   </PropertyGroup>
+diff --git a/tests/projects/Sample_ConsoleApp_net7/Sample_ConsoleApp_net7.fsproj b/tests/projects/Sample_ConsoleApp_net7/Sample_ConsoleApp_net7.fsproj
+index bf06c1ce7..fe9ed811d 100644
+--- a/tests/projects/Sample_ConsoleApp_net7/Sample_ConsoleApp_net7.fsproj
+++ b/tests/projects/Sample_ConsoleApp_net7/Sample_ConsoleApp_net7.fsproj
+@@ -2,13 +2,13 @@
+ 
+   <PropertyGroup>
+     <OutputType>Exe</OutputType>
+-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
+     <LangVersion>preview</LangVersion>
+   </PropertyGroup>
+ 
+   <PropertyGroup>
+-    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net8.0/fsc.dll</DotnetFscCompilerPath>
+-    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net8.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+    <DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net9.0/fsc.dll</DotnetFscCompilerPath>
+    <Fsc_DotNET_DotnetFscCompilerPath>$(MSBuildThisFileDirectory)../../../artifacts/bin/fsc/Debug/net9.0/fsc.dll</Fsc_DotNET_DotnetFscCompilerPath>
+     <FSharpPreferNetFrameworkTools>False</FSharpPreferNetFrameworkTools>
+     <FSharpPrefer64BitTools>True</FSharpPrefer64BitTools>
+   </PropertyGroup>
--- a/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch
+++ b/src/SourceBuild/patches/razor/0001-Explicitly-set-net9.0-TFM.patch
@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Wed, 18 Oct 2023 10:58:11 -0500
+Subject: [PATCH] Explicitly set net9.0 TFM
+
+Backport: https://github.com/dotnet/source-build/issues/3663
+---
+ Directory.Build.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Directory.Build.props b/Directory.Build.props
+index bf6754f23..d76f449be 100644
+--- a/Directory.Build.props
+++ b/Directory.Build.props
+@@ -66,7 +66,7 @@
+     -->
+     <When Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildFromSourceFlavor)' == 'Product'">
+       <PropertyGroup>
+-        <DefaultNetCoreTargetFramework>$(NetCurrent)</DefaultNetCoreTargetFramework>
+        <DefaultNetCoreTargetFramework>net9.0</DefaultNetCoreTargetFramework>
+         <DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework)</DefaultNetCoreTargetFrameworks>
+       </PropertyGroup>
+     </When>
--- a/src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch
+++ b/src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch
@ -0,0 +1,50 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Thu, 19 Oct 2023 08:52:35 -0500
+Subject: [PATCH] Use net9.0 for tool dependencies
+
+Backport: https://github.com/dotnet/source-build/issues/3663
+---
+ src/Layout/redist/targets/GenerateLayout.targets | 8 ++++----
+ src/Layout/tool_fsharp/tool_fsc.csproj           | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
+index eab01ef144..922b959531 100644
+--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
+@@ -112,9 +112,9 @@
+     </PropertyGroup>
+ 
+     <ItemGroup>
+-      <DotnetFormatDllFiles Include="$(Pkgdotnet-format)/tools/net8.0/any/**/*.dll" />
+-      <DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net8.0/any/**/*.json" />
+-      <DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net8.0/any/**/*.config" />
+      <DotnetFormatDllFiles Include="$(Pkgdotnet-format)/tools/net9.0/any/**/*.dll" />
+      <DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net9.0/any/**/*.json" />
+      <DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net9.0/any/**/*.config" />
+     </ItemGroup>
+ 
+     <Error Condition="'@(DotnetFormatDllFiles)' == ''" Text="Something moved around in dotnet-format package, adjust code here accordingly. TFM change?" />
+@@ -178,7 +178,7 @@
+           BeforeTargets="Build">
+     <PropertyGroup>
+       <TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildFromSource)' != 'true'" >netcoreapp3.1</TestCliNuGetDirectoryTargetFramework>
+-      <TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'" >net8.0</TestCliNuGetDirectoryTargetFramework>
+      <TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'" >net9.0</TestCliNuGetDirectoryTargetFramework>
+       <TestCliNuGetDirectory>$(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/</TestCliNuGetDirectory>
+     </PropertyGroup>
+     <ItemGroup>
+diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj
+index adb50eed03..530c3a546b 100644
+--- a/src/Layout/tool_fsharp/tool_fsc.csproj
+++ b/src/Layout/tool_fsharp/tool_fsc.csproj
+@@ -20,7 +20,7 @@
+     </PropertyGroup>
+     <ItemGroup>
+         <ResolvedFileToPublish
+-          Include="$(PkgMicrosoft_FSharp_Compiler)/lib/net8.0/FSharp.Core.xml"
+          Include="$(PkgMicrosoft_FSharp_Compiler)/lib/net9.0/FSharp.Core.xml"
+           CopyToPublishDirectory="PreserveNewest"
+           DestinationSubPath="FSharp.Core.xml"
+           RelativePath="FSharp.Core.xml"
--- a/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch
+++ b/src/SourceBuild/patches/vstest/0001-Explicitly-use-net9.0-TFM.patch
@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Matt Thalman <mthalman@microsoft.com>
+Date: Thu, 19 Oct 2023 08:29:45 -0500
+Subject: [PATCH] Explicitly use net9.0 TFM
+
+Backport: https://github.com/dotnet/source-build/issues/3663
+---
+ Directory.Build.targets                                         | 2 +-
+ .../Microsoft.TestPlatform.Build.csproj                         | 2 +-
+ .../Microsoft.TestPlatform.CLI.csproj                           | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Directory.Build.targets b/Directory.Build.targets
+index b720568b..617ca4fc 100644
+--- a/Directory.Build.targets
+++ b/Directory.Build.targets
+@@ -6,7 +6,7 @@
+   <!-- Source build properties -->
+   <PropertyGroup Condition=" '$(DotNetBuildFromSource)' == 'true' ">
+     <!-- Force setting TargetFrameworks to net7.0 only if it was set -->
+-    <TargetFrameworks Condition=" '$(TargetFrameworks)' != '' ">$(NetCurrent)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetFrameworks)' != '' ">net9.0</TargetFrameworks>
+     <!-- Force setting TargetFramework to net7.0 only if it was set -->
+     <TargetFramework Condition=" '$(TargetFramework)' != '' ">$(NetCurrent)</TargetFramework>
+   </PropertyGroup>
+diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+index a93852ce..945b1ac2 100644
+--- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj
+@@ -12,7 +12,7 @@
+   <Choose>
+     <When Condition=" '$(DotNetBuildFromSource)' == 'true' ">
+       <PropertyGroup>
+-        <Tfm>$(NetCurrent)</Tfm>
+        <Tfm>net9.0</Tfm>
+       </PropertyGroup>
+     </When>
+     <Otherwise>
+diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
+index b8f6849b..b56b993c 100644
+--- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
+++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.csproj
+@@ -31,7 +31,7 @@
+   <ItemGroup Label="NuGet">
+     <NuspecProperty Include="SrcPackageFolder=$(SrcPackageFolder)" />
+     <NuspecProperty Include="TesthostRuntimeconfig=$(RepoRoot)temp\testhost" />
+-    <NuspecProperty Include="SourceBuildTfm=$(NetCurrent)" />
+    <NuspecProperty Include="SourceBuildTfm=net9.0" />
+   </ItemGroup>
+ 
+   <PropertyGroup>
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
@ -5,7 +5,7 @@

  <ItemGroup>
    <PackageReference Include="FluentAssertions" Version="4.18.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
    <PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
    <PackageReference Include="System.Net.Http" Version="4.3.4" />
    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />