diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d6935ec278..4bc477b6c29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers b4d9a1334d5189172977ba8fddd00bda70161e4a - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 https://github.com/dotnet/installer 68e8abb1d3e1a240a6e4c29dcd220aae91681676 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index 574254c2c36..304e1bd2766 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 8.0.0-beta.24426.2 - 8.0.0-beta.24426.2 - 8.0.0-beta.24426.2 + 8.0.0-beta.24459.4 + 8.0.0-beta.24459.4 + 8.0.0-beta.24459.4 8.0.1 8.0.1-servicing.23580.8 diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index 0455de1055f..c0e8f91317f 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -25,20 +25,15 @@ steps: scriptType: 'pscore' scriptLocation: 'inlineScript' inlineScript: | - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. See https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $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)) diff --git a/global.json b/global.json index a0b0897e60f..9cc13e8c35d 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24459.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24459.4" } }