Merging internal commits for release/8.0.1xx (#35407)

Author: marcpopMSFT

.vsts-ci.yml

@@ -144,7 +144,7 @@ stages:
             vmImage: 'ubuntu-22.04'
           ${{ if ne(variables['System.TeamProject'], 'public') }}:
             name: $(DncEngInternalBuildPool)
-            demands: ImageOverride -equals 1es-ubuntu-2204
+            demands: ImageOverride -equals build.ubuntu.2204.amd64
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           helixTargetQueue: ubuntu.2204.amd64.open
         ${{ if ne(variables['System.TeamProject'], 'public') }}:

eng/build.yml

@@ -275,7 +275,7 @@ jobs:
           displayName: Run AoT Tests in Helix
           env:
               SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-              HelixAccessToken: ''
+              HelixAccessToken: $(_HelixApiToken)
               RunAoTTests: 'true'
 
       - ${{ if eq(parameters.agentOs, 'Darwin') }}:

eng/common/sdl/trim-assets-version.ps1

@@ -25,7 +25,7 @@ function Install-VersionTools-Cli {
   Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
   $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
 
-  $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed")
+  $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
   Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
 }