[main] Update dependencies from dotnet/arcade (#2600)

* Update dependencies from https://github.com/dotnet/arcade build 20231213.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23613.3 * Update dependencies from https://github.com/dotnet/arcade build 20231214.6 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23614.6 * Update dependencies from https://github.com/dotnet/arcade build 20231214.6 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23614.6 * Update dependencies from https://github.com/dotnet/arcade build 20231215.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23615.2 * Update dependencies from https://github.com/dotnet/arcade build 20231215.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23615.2 * Update dependencies from https://github.com/dotnet/arcade build 20231219.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23619.2 * Update dependencies from https://github.com/dotnet/arcade build 20231220.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23620.1 * Update dependencies from https://github.com/dotnet/arcade build 20231220.7 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23620.7 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231221.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23621.2 * Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1 * Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1 * Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1 * Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1 * Update dependencies from https://github.com/dotnet/arcade build 20231228.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23628.1 * Update dependencies from https://github.com/dotnet/arcade build 20240102.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24052.3 * Update dependencies from https://github.com/dotnet/arcade build 20240103.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24053.1 * Update dependencies from https://github.com/dotnet/arcade build 20240104.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24054.2 * Update dependencies from https://github.com/dotnet/arcade build 20240105.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24055.2 * Update dependencies from https://github.com/dotnet/arcade build 20240105.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24055.2 * Update dependencies from https://github.com/dotnet/arcade build 20240105.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24055.2 * Update dependencies from https://github.com/dotnet/arcade build 20240108.6 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24058.6 * Update dependencies from https://github.com/dotnet/arcade build 20240110.5 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24060.5 * Update dependencies from https://github.com/dotnet/arcade build 20240110.5 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24060.5 * Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24062.5 * Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24062.5 * Update dependencies from https://github.com/dotnet/arcade build 20240112.5 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24062.5 * Update dependencies from https://github.com/dotnet/arcade build 20240115.5 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24065.5 * Update dependencies from https://github.com/dotnet/arcade build 20240116.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24066.3 * Update dependencies from https://github.com/dotnet/arcade build 20240118.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24068.1 * Update dependencies from https://github.com/dotnet/arcade build 20240118.4 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24068.4 * Update dependencies from https://github.com/dotnet/arcade build 20240119.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.24069.2 * updated global.json --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Deep Choudhery <decho@microsoft.com>
2024-01-20 16:50:25 -05:00 · 2024-01-20 16:50:25 -05:00 · d0b4e20ae5
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23612.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24069.2">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d</Sha>
+      <Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
    </Dependency>
  </ToolsetDependencies>
  <ProductDependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -57,7 +57,7 @@
    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
    <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
-    <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
+    <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">false</IsServicingBuild>
    <!--
        When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
    -->
--- a/eng/common/build.cmd
+++ b/eng/common/build.cmd
@ -0,0 +1,3 @@
+@echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*"
+exit /b %ErrorLevel%
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@ -20,6 +20,7 @@ Param(
  [switch] $publish,
  [switch] $clean,
  [switch] $verticalBuild,
+  [switch][Alias('pb')]$productBuild,
  [switch][Alias('bl')]$binaryLog,
  [switch][Alias('nobl')]$excludeCIBinarylog,
  [switch] $ci,
@ -60,6 +61,7 @@ function Print-Usage() {
  Write-Host "  -publish                Publish artifacts (e.g. symbols)"
  Write-Host "  -clean                  Clean the solution"
  Write-Host "  -verticalBuild          Run in 'vertical build' infra mode."
+  Write-Host "  -productBuild           Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
  Write-Host ""

  Write-Host "Advanced settings:"
@ -122,6 +124,7 @@ function Build {
    /p:Deploy=$deploy `
    /p:Test=$test `
    /p:Pack=$pack `
+    /p:DotNetBuildRepo=$($productBuild -or $verticalBuild) `
    /p:ArcadeBuildVertical=$verticalBuild `
    /p:IntegrationTest=$integrationTest `
    /p:PerformanceTest=$performanceTest `
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@ -22,6 +22,9 @@ usage()
  echo "  --sourceBuild              Source-build the solution (short: -sb)"
  echo "                             Will additionally trigger the following actions: --restore, --build, --pack"
  echo "                             If --configuration is not set explicitly, will also set it to 'Release'"
+  echo "  --productBuild             Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)"
+  echo "                             Will additionally trigger the following actions: --restore, --build, --pack"
+  echo "                             If --configuration is not set explicitly, will also set it to 'Release'"
  echo "  --rebuild                  Rebuild solution"
  echo "  --test                     Run all unit tests in the solution (short: -t)"
  echo "  --integrationTest          Run all integration tests in the solution"
@ -60,6 +63,7 @@ restore=false
 build=false
 source_build=false
 vertical_build=false
+product_build=false
 rebuild=false
 test=false
 integration_test=false
@ -127,12 +131,20 @@ while [[ $# > 0 ]]; do
    -sourcebuild|-sb)
      build=true
      source_build=true
+      product_build=true
+      restore=true
+      pack=true
+      ;;
+    -productBuild|-pb)
+      build=true
+      product_build=true
      restore=true
      pack=true
      ;;
    -verticalbuild|-vb)
      build=true
      vertical_build=true
+      product_build=true
      restore=true
      pack=true
      ;;
@ -226,6 +238,7 @@ function Build {
    /p:RepoRoot="$repo_root" \
    /p:Restore=$restore \
    /p:Build=$build \
+    /p:DotNetBuildRepo=$product_build \
    /p:ArcadeBuildFromSource=$source_build \
    /p:ArcadeBuildVertical=$vertical_build \
    /p:Rebuild=$rebuild \
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@ -8,7 +8,7 @@ usage()
    echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
    echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
    echo "                               for alpine can be specified with version: alpineX.YY or alpineedge"
-    echo "                               for FreeBSD can be: freebsd12, freebsd13"
+    echo "                               for FreeBSD can be: freebsd13, freebsd14"
    echo "                               for illumos can be: illumos"
    echo "                               for Haiku can be: haiku."
    echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev"
 __AlpinePackages+=" openssl-dev"
 __AlpinePackages+=" zlib-dev"

-__FreeBSDBase="12.4-RELEASE"
-__FreeBSDPkg="1.17.0"
-__FreeBSDABI="12"
+__FreeBSDBase="13.2-RELEASE"
+__FreeBSDPkg="1.20.0"
+__FreeBSDABI="13"
 __FreeBSDPackages="libunwind"
 __FreeBSDPackages+=" icu"
 __FreeBSDPackages+=" libinotify"
@ -182,12 +182,12 @@ while :; do
            __AlpinePackages="${__AlpinePackages// lldb-dev/}"
            __QEMUArch=riscv64
            __UbuntuArch=riscv64
-            __UbuntuRepo="http://deb.debian.org/debian-ports"
+            __UbuntuRepo="http://deb.debian.org/debian"
            __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
            unset __LLDB_Package

-            if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
-                __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
+            if [[ -e "/usr/share/keyrings/debian-archive-keyring.gpg" ]]; then
+                __Keyring="--keyring /usr/share/keyrings/debian-archive-keyring.gpg --include=debian-archive-keyring"
            fi
            ;;
        ppc64le)
@ -334,14 +334,14 @@ while :; do
                __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
            fi
            ;;
-        freebsd12)
+        freebsd13)
            __CodeName=freebsd
            __SkipUnmount=1
            ;;
-        freebsd13)
+        freebsd14)
            __CodeName=freebsd
-            __FreeBSDBase="13.2-RELEASE"
-            __FreeBSDABI="13"
+            __FreeBSDBase="14.0-RELEASE"
+            __FreeBSDABI="14"
            __SkipUnmount=1
            ;;
        illumos)
--- a/eng/common/cross/riscv64/sources.list.sid
+++ b/eng/common/cross/riscv64/sources.list.sid
@ -1 +1 @@
-deb http://deb.debian.org/debian-ports sid main
+deb http://deb.debian.org/debian sid main
--- a/eng/common/helixpublish.proj
+++ b/eng/common/helixpublish.proj
@ -1,3 +1,4 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">

  <PropertyGroup>
--- a/eng/common/internal/Directory.Build.props
+++ b/eng/common/internal/Directory.Build.props
@ -1,4 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project>
+
  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
 </Project>
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@ -1,5 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
 <Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
    <TargetFramework>net472</TargetFramework>
    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
@ -27,4 +28,5 @@

  <!-- Repository extensibility point -->
  <Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />
+
 </Project>
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@ -136,7 +136,7 @@ jobs:
        condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))

  - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
-    - task: NuGetAuthenticate@0
+    - task: NuGetAuthenticate@1

  - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}:
    - task: DownloadPipelineArtifact@2
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@ -63,6 +63,10 @@ jobs:

  steps:
  - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - checkout: self
+      fetchDepth: 3
+      clean: true
+      
    - task: DownloadBuildArtifacts@0
      displayName: Download artifact
      inputs:
@ -72,7 +76,7 @@ jobs:
      condition: ${{ parameters.condition }}
      continueOnError: ${{ parameters.continueOnError }}
    
-    - task: NuGetAuthenticate@0
+    - task: NuGetAuthenticate@1

    - task: PowerShell@2
      displayName: Publish Build Assets
--- a/eng/common/templates/job/source-index-stage1.yml
+++ b/eng/common/templates/job/source-index-stage1.yml
@ -1,6 +1,6 @@
 parameters:
  runAsPublic: false
-  sourceIndexPackageVersion: 1.0.1-20230228.2
+  sourceIndexPackageVersion: 1.0.1-20231213.4
  sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
  sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
  preSteps: []
@ -30,20 +30,20 @@ jobs:
    pool:
      ${{ if eq(variables['System.TeamProject'], 'public') }}:
        name: $(DncEngPublicBuildPool)
-        demands: ImageOverride -equals windows.vs2019.amd64.open
+        demands: ImageOverride -equals windows.vs2022.amd64.open
      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
        name: $(DncEngInternalBuildPool)
-        demands: ImageOverride -equals windows.vs2019.amd64
+        demands: ImageOverride -equals windows.vs2022.amd64

  steps:
  - ${{ each preStep in parameters.preSteps }}:
    - ${{ preStep }}

  - task: UseDotNet@2
-    displayName: Use .NET Core SDK 6
+    displayName: Use .NET 8 SDK
    inputs:
      packageType: sdk
-      version: 6.0.x
+      version: 8.0.x
      installationPath: $(Agent.TempDirectory)/dotnet
      workingDirectory: $(Agent.TempDirectory)

--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@ -18,7 +18,7 @@ variables:
  - name: SymbolToolVersion
    value: 1.0.1
  - name: BinlogToolVersion
-    value: 1.0.8
+    value: 1.0.11

  - name: runCodesignValidationInjection
    value: false
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@ -169,7 +169,7 @@ stages:
        # This is necessary whenever we want to publish/restore to an AzDO private feed
        # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
        # otherwise it'll complain about accessing a private feed.
-        - task: NuGetAuthenticate@0
+        - task: NuGetAuthenticate@1
          displayName: 'Authenticate to AzDO Feeds'

        # Signing validation will optionally work with the buildmanifest file which is downloaded from
@ -267,7 +267,7 @@ stages:
            BARBuildId: ${{ parameters.BARBuildId }}
            PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}

-        - task: NuGetAuthenticate@0
+        - task: NuGetAuthenticate@1

        - task: PowerShell@2
          displayName: Publish Using Darc
--- a/eng/common/templates/steps/publish-logs.yml
+++ b/eng/common/templates/steps/publish-logs.yml
@ -3,7 +3,7 @@ parameters:
  JobLabel: ''
  CustomSensitiveDataList: ''
  # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
-  BinlogToolVersion: '1.0.8'
+  BinlogToolVersion: '1.0.11'

 steps:
 - task: Powershell@2
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@ -94,6 +94,7 @@ steps:
      $baseOsArgs \
      /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
      /p:ArcadeBuildFromSource=true \
+      /p:DotNetBuildRepo=true \
      /p:AssetManifestFileName=$assetManifestFileName
  displayName: Build

@ -105,7 +106,7 @@ steps:
    Contents: |
      **/*.log
      **/*.binlog
-      artifacts/source-build/self/prebuilt-report/**
+      artifacts/sb/prebuilt-report/**
    TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
    CleanTargetFolder: true
  continueOnError: true
@ -126,4 +127,4 @@ steps:
 - task: ComponentGovernanceComponentDetection@0
  displayName: Component Detection (Exclude upstream cache)
  inputs:
-    ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
+    ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -165,11 +165,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
  }

-  # Source Build uses DotNetCoreSdkDir variable
-  if ($env:DotNetCoreSdkDir -ne $null) {
-    $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir
-  }
-
  # Find the first path on %PATH% that contains the dotnet.exe
  if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) {
    $dotnetExecutable = GetExecutableFileName 'dotnet'
@ -601,7 +596,15 @@ function InitializeBuildTool() {
      ExitWithExitCode 1
    }
    $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
-    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' }
+
+    # Use override if it exists - commonly set by source-build
+    if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) {
+      $initializeBuildToolFramework="net9.0"
+    } else {
+      $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework
+    }
+    
+    $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework }
  } elseif ($msbuildEngine -eq "vs") {
    try {
      $msbuildPath = InitializeVisualStudioMSBuild -install:$restore
@ -676,8 +679,14 @@ function Read-ArcadeSdkVersion() {
 }

 function InitializeToolset() {
-  if (Test-Path variable:global:_ToolsetBuildProj) {
-    return $global:_ToolsetBuildProj
+  # For Unified Build/Source-build support, check whether the environment variable is
+  # set. If it is, then use this as the toolset build project.
+  if ($env:_InitializeToolset -ne $null) {
+    return $global:_InitializeToolset = $env:_InitializeToolset
+  }
+
+  if (Test-Path variable:global:_InitializeToolset) {
+    return $global:_InitializeToolset
  }

  $nugetCache = GetNuGetPackageCachePath
@ -688,7 +697,7 @@ function InitializeToolset() {
  if (Test-Path $toolsetLocationFile) {
    $path = Get-Content $toolsetLocationFile -TotalCount 1
    if (Test-Path $path) {
-      return $global:_ToolsetBuildProj = $path
+      return $global:_InitializeToolset = $path
    }
  }

@ -711,7 +720,7 @@ function InitializeToolset() {
    throw "Invalid toolset path: $path"
  }

-  return $global:_ToolsetBuildProj = $path
+  return $global:_InitializeToolset = $path
 }

 function ExitWithExitCode([int] $exitCode) {
@ -763,12 +772,10 @@ function MSBuild() {
      # new scripts need to work with old packages, so we need to look for the old names/versions
      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')),
      (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')),
-      (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
-      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll'))
      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')),
-      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
+      (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')),
+      (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')),
+      (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll'))
    )
    $selectedPath = $null
    foreach ($path in $possiblePaths) {
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@ -123,11 +123,6 @@ function InitializeDotNetCli {
  # so it doesn't output warnings to the console.
  export LTTNG_HOME="$HOME"

-  # Source Build uses DotNetCoreSdkDir variable
-  if [[ -n "${DotNetCoreSdkDir:-}" ]]; then
-    export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir"
-  fi
-
  # Find the first path on $PATH that contains the dotnet.exe
  if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then
    local dotnet_path=`command -v dotnet`
@ -343,7 +338,7 @@ function InitializeBuildTool {
  _InitializeBuildToolCommand="msbuild"
  # use override if it exists - commonly set by source-build
  if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
-    _InitializeBuildToolFramework="net8.0"
+    _InitializeBuildToolFramework="net9.0"
  else
    _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
  fi
@ -458,12 +453,10 @@ function MSBuild {
    local possiblePaths=()
    possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" )
    possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" )
-    possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" )
    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" )
    possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" )
+    possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" )
+    possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" )
    for path in "${possiblePaths[@]}"; do
      if [[ -f $path ]]; then
        selectedPath=$path
--- a/global.json
+++ b/global.json
@ -8,7 +8,7 @@
    "dotnet": "8.0.100"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23601.1"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23607.2"
  }
 }