diff --git a/NuGet.config b/NuGet.config
index d1b04861eaa70..ea005c53c77b1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,13 +10,6 @@
-
-
-
-
-
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index d5701f45f965e..8b459fa150956 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,9 +111,9 @@
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
@@ -121,69 +121,69 @@
73f0850939d96131c28cf6ea6ee5aacb4da0083a
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
https://github.com/dotnet/runtime-assets
@@ -334,9 +334,9 @@
https://github.com/dotnet/xharness
2195e37696de37d2c2b0f83d73f49c96d9b584de
-
+
https://github.com/dotnet/arcade
- e5b13e054339e41d422212a0ecaf24fec20cb5a1
+ f7fb1fec01b91be69e4dcc5290a0bff3f28e214f
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 5faf5f839ef76..9557205b78c92 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -87,21 +87,21 @@
8.0.100
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 2.5.1-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
- 8.0.0-beta.24508.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 2.5.1-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
+ 8.0.0-beta.24516.1
6.0.0-preview.1.102
diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml
index c0e8f91317f07..c690cc0a070cd 100644
--- a/eng/common/templates-official/steps/get-delegation-sas.yml
+++ b/eng/common/templates-official/steps/get-delegation-sas.yml
@@ -28,7 +28,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/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml
index c0e8f91317f07..c690cc0a070cd 100644
--- a/eng/common/templates/steps/get-delegation-sas.yml
+++ b/eng/common/templates/steps/get-delegation-sas.yml
@@ -28,7 +28,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/global.json b/global.json
index a2a0581ed84a9..4aea1744d8298 100644
--- a/global.json
+++ b/global.json
@@ -8,9 +8,9 @@
"dotnet": "8.0.110"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24508.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1",
+ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24516.1",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"