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

This pull request updates the following dependencies [marker]: <> (Begin:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d) ## From https://github.com/dotnet/arcade - **Subscription**: 2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d - **Build**: 20231220.2 - **Date Produced**: December 20, 2023 12:15:53 PM UTC - **Commit**: 84129325171e65373edef24019e1171feeb19cbc - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.23613.3 to 8.0.0-beta.23620.2][1] [1]: b6349a217d...8412932517 [DependencyUpdate]: <> (End) [marker]: <> (End:2907dbca-fa2e-42bc-f7dd-08dc0c5b4e6d)
2024-01-03 16:10:24 -08:00 · 2024-01-03 16:10:24 -08:00 · 2b4e0e9ddc
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -90,14 +90,15 @@
      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
      <Sha>3a25a7f1cc446b60678ed25c9d829420d6321eba</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23613.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23620.2">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b6349a217d7e2f6b5c1831702f8beef5c171da3f</Sha>
+      <Sha>84129325171e65373edef24019e1171feeb19cbc</Sha>
      <SourceBuild RepoName="arcade" ManagedOnly="true" />
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23613.3">
-      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>b6349a217d7e2f6b5c1831702f8beef5c171da3f</Sha>
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
+      <Uri>https://github.com/dotnet/xliff-tasks</Uri>
+      <Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
+      <SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
    </Dependency>
    <!-- Necessary for source-build. This allows Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages
         to be retrieved from live source-build and their content consumed by packages produced by razor.
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -70,7 +70,7 @@
    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.9.0-1.23530.5</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.9.0-1.23530.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.9.0-1.23530.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
-    <MicrosoftDotNetXliffTasksPackageVersion>9.0.0-beta.23613.3</MicrosoftDotNetXliffTasksPackageVersion>
+    <MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
    <!--
      Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
      but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@ -19,7 +19,6 @@ Param(
  [switch] $pack,
  [switch] $publish,
  [switch] $clean,
-  [switch] $verticalBuild,
  [switch][Alias('bl')]$binaryLog,
  [switch][Alias('nobl')]$excludeCIBinarylog,
  [switch] $ci,
@ -59,7 +58,6 @@ function Print-Usage() {
  Write-Host "  -sign                   Sign build outputs"
  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 ""

  Write-Host "Advanced settings:"
@ -122,7 +120,6 @@ function Build {
    /p:Deploy=$deploy `
    /p:Test=$test `
    /p:Pack=$pack `
-    /p:ArcadeBuildVertical=$verticalBuild `
    /p:IntegrationTest=$integrationTest `
    /p:PerformanceTest=$performanceTest `
    /p:Sign=$sign `
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@ -59,7 +59,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
 restore=false
 build=false
 source_build=false
-vertical_build=false
 rebuild=false
 test=false
 integration_test=false
@ -106,7 +105,7 @@ while [[ $# > 0 ]]; do
    -binarylog|-bl)
      binary_log=true
      ;;
-    -excludecibinarylog|-nobl)
+    -excludeCIBinarylog|-nobl)
      exclude_ci_binary_log=true
      ;;
    -pipelineslog|-pl)
@ -130,12 +129,6 @@ while [[ $# > 0 ]]; do
      restore=true
      pack=true
      ;;
-    -verticalbuild|-vb)
-      build=true
-      vertical_build=true
-      restore=true
-      pack=true
-      ;;
    -test|-t)
      test=true
      ;;
@ -227,7 +220,6 @@ function Build {
    /p:Restore=$restore \
    /p:Build=$build \
    /p:ArcadeBuildFromSource=$source_build \
-    /p:ArcadeBuildVertical=$vertical_build \
    /p:Rebuild=$rebuild \
    /p:Test=$test \
    /p:Pack=$pack \
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
            -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
            -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
            -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
-            search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
+            search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
    fi

    # install all packages in one go
--- a/eng/common/cross/riscv64/tizen/tizen.patch
+++ b/eng/common/cross/riscv64/tizen/tizen.patch
@ -1,9 +0,0 @@
-diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
--- a/usr/lib64/libc.so	2016-12-30 23:00:08.284951863 +0900
-+++ b/usr/lib64/libc.so	2016-12-30 23:00:32.140951815 +0900
-@@ -2,4 +2,4 @@
-    Use the shared library, but some functions are only in
-    the static library, so try that secondarily.  */
- OUTPUT_FORMAT(elf64-littleriscv)
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
-+GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )
--- a/eng/common/cross/tizen-build-rootfs.sh
+++ b/eng/common/cross/tizen-build-rootfs.sh
@ -22,10 +22,6 @@ case "$ARCH" in
        TIZEN_ARCH="x86_64"
        LINK_ARCH="x86"
        ;;
-    riscv64)
-        TIZEN_ARCH="riscv64"
-        LINK_ARCH="riscv"
-        ;;
    *)
        echo "Unsupported architecture for tizen: $ARCH"
        exit 1
@ -62,21 +58,4 @@ rm -rf $TIZEN_TMP_DIR
 echo ">>Start configuring Tizen rootfs"
 ln -sfn asm-${LINK_ARCH} ./usr/include/asm
 patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
-if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
-    echo "Fixing broken symlinks in $PWD"
-    rm ./usr/lib64/libresolv.so
-    ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
-    rm ./usr/lib64/libpthread.so
-    ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
-    rm ./usr/lib64/libdl.so
-    ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
-    rm ./usr/lib64/libutil.so
-    ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
-    rm ./usr/lib64/libm.so
-    ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
-    rm ./usr/lib64/librt.so
-    ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
-    rm ./lib/ld-linux-riscv64-lp64d.so.1
-    ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
-fi
 echo "<<Finish configuring Tizen rootfs"
--- a/eng/common/cross/tizen-fetch.sh
+++ b/eng/common/cross/tizen-fetch.sh
@ -156,28 +156,17 @@ fetch_tizen_pkgs()
    done
 }

-if [ "$TIZEN_ARCH" == "riscv64" ]; then
-    BASE="Tizen-Base-RISCV"
-    UNIFIED="Tizen-Unified-RISCV"
-else
-    BASE="Tizen-Base"
-    UNIFIED="Tizen-Unified"
-fi
-
 Inform "Initialize ${TIZEN_ARCH} base"
-fetch_tizen_pkgs_init standard $BASE
+fetch_tizen_pkgs_init standard Tizen-Base
 Inform "fetch common packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
 Inform "fetch coreclr packages"
-fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
-if [ "$TIZEN_ARCH" != "riscv64" ]; then
-    fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
-fi
+fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
 Inform "fetch corefx packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel

 Inform "Initialize standard unified"
-fetch_tizen_pkgs_init standard $UNIFIED
+fetch_tizen_pkgs_init standard Tizen-Unified
 Inform "fetch corefx packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release

--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@ -80,9 +80,6 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
    set(TOOLCHAIN "riscv64-alpine-linux-musl")
  else()
    set(TOOLCHAIN "riscv64-linux-gnu")
-    if(TIZEN)
-      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
-    endif()
  endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
  set(CMAKE_SYSTEM_PROCESSOR s390x)
@ -147,10 +144,6 @@ if(TIZEN)
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
  endif()
-  if(TARGET_ARCH_NAME STREQUAL "riscv64")
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
-    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
-  endif()
 endif()

 if(ANDROID)
@ -277,7 +270,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
  endif()
-elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
+elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
  if(TIZEN)
    add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
    add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
@ -288,8 +281,6 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
    add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
  endif()
-elseif(TARGET_ARCH_NAME STREQUAL "s390x")
-  add_toolchain_linker_flag("--target=${TOOLCHAIN}")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
    add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@ -337,8 +328,6 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
  if(TARGET_ARCH_NAME STREQUAL "armel")
    add_compile_options(-mfloat-abi=softfp)
  endif()
-elseif(TARGET_ARCH_NAME STREQUAL "s390x")
-  add_compile_options("--target=${TOOLCHAIN}")
 elseif(TARGET_ARCH_NAME STREQUAL "x86")
  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
    add_compile_options(--target=${TOOLCHAIN})
--- 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/main/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/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info."
    ExitWithExitCode 0
  }

--- a/eng/common/post-build/redact-logs.ps1
+++ b/eng/common/post-build/redact-logs.ps1
@ -1,81 +0,0 @@
-[CmdletBinding(PositionalBinding=$False)]
-param(
-  [Parameter(Mandatory=$true, Position=0)][string] $InputPath,
-  [Parameter(Mandatory=$true)][string] $BinlogToolVersion,
-  [Parameter(Mandatory=$false)][string] $DotnetPath,
-  [Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json',
-  # File with strings to redact - separated by newlines.
-  #  For comments start the line with '# ' - such lines are ignored 
-  [Parameter(Mandatory=$false)][string] $TokensFilePath,
-  [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact
-)
-
-try {
-  . $PSScriptRoot\post-build-utils.ps1
-
-  $packageName = 'binlogtool'
-
-  $dotnet = $DotnetPath
-
-  if (!$dotnet) {
-    $dotnetRoot = InitializeDotNetCli -install:$true
-    $dotnet = "$dotnetRoot\dotnet.exe"
-  }
-  
-  $toolList = & "$dotnet" tool list -g
-
-  if ($toolList -like "*$packageName*") {
-    & "$dotnet" tool uninstall $packageName -g
-  }
-
-  $toolPath  = "$PSScriptRoot\..\..\..\.tools"
-  $verbosity = 'minimal'
-  
-  New-Item -ItemType Directory -Force -Path $toolPath
-  
-  Push-Location -Path $toolPath
-
-  try {
-    Write-Host "Installing Binlog redactor CLI..."
-    Write-Host "'$dotnet' new tool-manifest"
-    & "$dotnet" new tool-manifest
-    Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion"
-    & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion
-
-    if (Test-Path $TokensFilePath) {
-        Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath
-        $TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " }
-    }
-
-    $optionalParams = [System.Collections.ArrayList]::new()
-  
-    Foreach ($p in $TokensToRedact)
-    {
-      if($p -match '^\$\(.*\)$')
-      {
-        Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable"  -f $p)
-      }          
-      elseif($p)
-      {
-        $optionalParams.Add("-p:" + $p) | Out-Null
-      }
-    }
-
-    & $dotnet binlogtool redact --input:$InputPath --recurse --in-place `
-      @optionalParams
-
-    if ($LastExitCode -ne 0) {
-      Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now."
-    }
-  }
-  finally {
-    Pop-Location
-  }
-
-  Write-Host 'done.'
-} 
-catch {
-  Write-Host $_
-  Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_"
-  ExitWithExitCode 1
-}
--- 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
@ -154,7 +154,7 @@ jobs:
      displayName: RichCodeNav Upload
      inputs:
        languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
-        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
+        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
        richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
        uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
      continueOnError: true
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@ -48,8 +48,8 @@ jobs:
    - group: AzureDevOps-Artifact-Feeds-Pats
    - name: runCodesignValidationInjection
      value: false
-    # unconditional - needed for logs publishing (redactor tool version)
-    - template: /eng/common/templates/post-build/common-variables.yml
+    - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+      - template: /eng/common/templates/post-build/common-variables.yml

  pool:
    # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@ -72,7 +72,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-20231213.4
+  sourceIndexPackageVersion: 1.0.1-20230228.2
  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.vs2022.amd64.open
+        demands: ImageOverride -equals windows.vs2019.amd64.open
      ${{ if eq(variables['System.TeamProject'], 'internal') }}:
        name: $(DncEngInternalBuildPool)
-        demands: ImageOverride -equals windows.vs2022.amd64
+        demands: ImageOverride -equals windows.vs2019.amd64

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

  - task: UseDotNet@2
-    displayName: Use .NET 8 SDK
+    displayName: Use .NET Core SDK 6
    inputs:
      packageType: sdk
-      version: 8.0.x
+      version: 6.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
@ -17,8 +17,6 @@ variables:
    value: 3.0.0
  - name: SymbolToolVersion
    value: 1.0.1
-  - name: BinlogToolVersion
-    value: 1.0.8

  - 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
@ -187,7 +187,6 @@ stages:
          parameters:
            StageLabel: 'Validation'
            JobLabel: 'Signing'
-            BinlogToolVersion: $(BinlogToolVersion)

    - job:
      displayName: SourceLink Validation
@ -267,7 +266,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
@ -1,9 +1,6 @@
 parameters:
  StageLabel: ''
  JobLabel: ''
-  CustomSensitiveDataList: ''
-  # A default - in case value from eng/common/templates/post-build/common-variables.yml is not passed
-  BinlogToolVersion: '1.0.8'

 steps:
 - task: Powershell@2
@ -15,30 +12,7 @@ steps:
      Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/
  continueOnError: true
  condition: always()
-    
- task: PowerShell@2
-  displayName: Redact Logs
-  inputs:
-    filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1
-    # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml
-    # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
-    #  If the file exists - sensitive data for redaction will be sourced from it
-    #  (single entry per line, lines starting with '# ' are considered comments and skipped)
-    arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' 
-      -BinlogToolVersion ${{parameters.BinlogToolVersion}}
-      -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt'
-      '$(publishing-dnceng-devdiv-code-r-build-re)'
-      '$(MaestroAccessToken)'
-      '$(dn-bot-all-orgs-artifact-feeds-rw)'
-      '$(akams-client-id)'
-      '$(akams-client-secret)'
-      '$(microsoft-symbol-server-pat)'
-      '$(symweb-symbol-server-pat)'
-      '$(dn-bot-all-orgs-build-rw-code-rw)'
-      ${{parameters.CustomSensitiveDataList}}
-  continueOnError: true
-  condition: always()
-      
+
 - task: PublishBuildArtifacts@1
  displayName: Publish Logs
  inputs:
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -158,13 +158,18 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
  $env:DOTNET_MULTILEVEL_LOOKUP=0

  # Disable first run since we do not need all ASP.NET packages restored.
-  $env:DOTNET_NOLOGO=1
+  $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1

  # Disable telemetry on CI.
  if ($ci) {
    $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'
@ -223,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
  Write-PipelinePrependPath -Path $dotnetRoot

  Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
-  Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1'
+  Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'

  return $global:_DotNetInstallDir = $dotnetRoot
 }
@ -822,8 +827,7 @@ function MSBuild-Core() {
    }
  }

-  # Be sure quote the path in case there are spaces in the dotnet installation location.
-  $env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs"
+  $env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs"

  $exitCode = Exec-Process $buildTool.Path $cmdArgs

--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@ -112,7 +112,7 @@ function InitializeDotNetCli {
  export DOTNET_MULTILEVEL_LOOKUP=0

  # Disable first run since we want to control all package sources
-  export DOTNET_NOLOGO=1
+  export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1

  # Disable telemetry on CI
  if [[ $ci == true ]]; then
@ -123,6 +123,11 @@ 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`
@ -160,7 +165,7 @@ function InitializeDotNetCli {
  Write-PipelinePrependPath -path "$dotnet_root"

  Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
-  Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1"
+  Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"

  # return value
  _InitializeDotNetCli="$dotnet_root"
@ -305,7 +310,7 @@ function GetDotNetInstallScript {
      curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
        if command -v openssl &> /dev/null; then
          echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
-          echo | openssl s_client -showcerts -servername dotnet.microsoft.com  -connect dotnet.microsoft.com:443 || true
+          echo | openssl s_client -showcerts -servername dotnet.microsoft.com  -connect dotnet.microsoft.com:443
        fi
        echo "Will now retry the same URL with verbose logging."
        with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
@ -336,12 +341,7 @@ function InitializeBuildTool {
  # return values
  _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
  _InitializeBuildToolCommand="msbuild"
-  # use override if it exists - commonly set by source-build
-  if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then
-    _InitializeBuildToolFramework="net8.0"
-  else
-    _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}"
-  fi
+  _InitializeBuildToolFramework="net8.0"
 }

 # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116
--- a/global.json
+++ b/global.json
@ -21,6 +21,6 @@
    "rollForward": "latestPatch"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23620.2"
  }
 }