Merge commit 'e49bbfbb49f98587b8bf26356b89157fb81d3807'

Author: Mirroring

eng/Version.Details.xml

@@ -56,17 +56,17 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24360.5">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24426.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
+ <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24360.5">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24426.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
+ <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24360.5">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24426.2">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
+ <Sha>80264e60280e2815e7d65871081ccac04a32445c</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -32,7 +32,7 @@
  <MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.9-servicing.24415.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>
  </PropertyGroup>
  <PropertyGroup Label="Dependencies from dotnet/arcade">
- <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksTemplatingVersion>
+ <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24426.2</MicrosoftDotNetBuildTasksTemplatingVersion>
  </PropertyGroup>
  <PropertyGroup Label="Other dependencies">
  <!-- NB: This version affects Visual Studio compatibility. See https://learn.microsoft.com/visualstudio/extensibility/roslyn-version-support -->

eng/common/sdl/NuGet.config

@@ -5,11 +5,11 @@
  </solution>
  <packageSources>
  <clear />
- <add key="guardian" value="https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json" />
+ <add key="guardian" value="https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json" />
  </packageSources>
  <packageSourceMapping>
  <packageSource key="guardian">
- <package pattern="microsoft.guardian.cli" />
+ <package pattern="Microsoft.Guardian.Cli.win-x64" />
  </packageSource>
  </packageSourceMapping>
  <disabledPackageSources>

eng/common/sdl/execute-all-sdl-tools.ps1

@@ -6,7 +6,6 @@ Param(
  [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master
  [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located
  [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located
- [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault
 
  # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list
  # format.
@@ -75,7 +74,7 @@ try {
  }
 
  Exec-BlockVerbosely {
- & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel
+ & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel
  }
  $gdnFolder = Join-Path $workingDirectory '.gdn'
 
@@ -104,7 +103,6 @@ try {
  -TargetDirectory $targetDirectory `
  -GdnFolder $gdnFolder `
  -ToolsList $tools `
- -AzureDevOpsAccessToken $AzureDevOpsAccessToken `
  -GuardianLoggerLevel $GuardianLoggerLevel `
  -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams `
  -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams `

eng/common/sdl/init-sdl.ps1

@@ -3,7 +3,6 @@ Param(
  [string] $Repository,
  [string] $BranchName='master',
  [string] $WorkingDirectory,
- [string] $AzureDevOpsAccessToken,
  [string] $GuardianLoggerLevel='Standard'
 )
 
@@ -21,14 +20,7 @@ $ci = $true
 # Don't display the console progress UI - it's a huge perf hit
 $ProgressPreference = 'SilentlyContinue'
 
-# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file
-$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken"))
-$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn")
-$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0"
-$zipFile = "$WorkingDirectory/gdn.zip"
-
 Add-Type -AssemblyName System.IO.Compression.FileSystem
-$gdnFolder = (Join-Path $WorkingDirectory '.gdn')
 
 try {
  # if the folder does not exist, we'll do a guardian init and push it to the remote repository

eng/common/sdl/sdl.ps1

@@ -4,6 +4,8 @@ function Install-Gdn {
  [Parameter(Mandatory=$true)]
  [string]$Path,
 
+ [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json",
+
  # If omitted, install the latest version of Guardian, otherwise install that specific version.
  [string]$Version
  )
@@ -19,7 +21,7 @@ function Install-Gdn {
  $ci = $true
  . $PSScriptRoot\..\tools.ps1
 
- $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
+ $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache")
 
  if ($Version) {
  $argumentList += "-Version $Version"

eng/common/templates-official/job/publish-build-assets.yml

@@ -149,7 +149,7 @@ jobs:
  scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
  arguments: -BuildId $(BARBuildId)
  -PublishingInfraVersion 3
- -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+ -AzdoToken '$(System.AccessToken)'
  -WaitPublishingFinish true
  -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
  -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

eng/common/templates-official/post-build/post-build.yml

@@ -281,7 +281,7 @@ stages:
  scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
  arguments: -BuildId $(BARBuildId) 
  -PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
- -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
+ -AzdoToken '$(System.AccessToken)'
  -WaitPublishingFinish true
  -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
  -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

eng/common/templates-official/steps/execute-sdl.yml

@@ -9,8 +9,6 @@ parameters:
 
 steps:
 - task: NuGetAuthenticate@1
- inputs:
- nuGetServiceConnections: GuardianConnect
 
 - task: NuGetToolInstaller@1
  displayName: 'Install NuGet.exe'

eng/common/templates-official/steps/get-delegation-sas.yml

@@ -28,17 +28,12 @@ steps:
  # Calculate the expiration of the SAS token and convert to UTC
  $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
 
- # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
- # of correlation payloads.
- $sas = ""
- do {
- $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
+ $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv
 
- if ($LASTEXITCODE -ne 0) {
- Write-Error "Failed to generate SAS token."
- exit 1
- }
- } while($sas.IndexOf('/') -ne -1)
+ if ($LASTEXITCODE -ne 0) {
+ Write-Error "Failed to generate SAS token."
+ exit 1
+ }
 
  if ('${{ parameters.base64Encode }}' -eq 'true') {
  $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas))