diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd932a3587f95..9b206874381a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 9794254fa909ff5adc46326e9b54009793f61dcd - + https://github.com/dotnet/arcade - 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 + 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 5ef6f7852134b..7905d4863604f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.100-rtm.24504.15 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 2.9.0-beta.24473.1 - 9.0.0-beta.24473.1 - 2.9.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 - 9.0.0-beta.24473.1 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 2.9.0-beta.24516.2 + 9.0.0-beta.24516.2 + 2.9.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 + 9.0.0-beta.24516.2 1.4.0 diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index d2901470a7f0b..9db5617ea7dea 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,7 +31,16 @@ 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") - $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 + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $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 + 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." diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78c18..605692d2fb770 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8f9a4..d1aeb92fcea51 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9df09..22954477a5747 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -900,7 +900,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 84924eac6ee00..da95fd7040179 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.100-rc.1.24452.12", + "version": "9.0.100-rc.2.24474.11", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.100-rc.1.24452.12" + "dotnet": "9.0.100-rc.2.24474.11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24473.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24516.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24503.8"