Skip to content

Commit 86f901d

Browse files
author
Mirroring
committed
Merge commit '579c090fcad5aa084d72b5249e4e506b7f1d3479'
2 parents 92eeb1f + 579c090 commit 86f901d

File tree

5 files changed

+38
-20
lines changed

5 files changed

+38
-20
lines changed

‎eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
184+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24508.1">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24516.1">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
188+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24508.1">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24516.1">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
192+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
196+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24508.1">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24516.1">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
200+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24508.1">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
204+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.24508.1</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24508.1</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24508.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.24516.1</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24516.1</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
31-
$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
31+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33+
$sas = ""
34+
do {
35+
$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
36+
if ($LASTEXITCODE -ne 0) {
37+
Write-Error "Failed to generate SAS token."
38+
exit 1
39+
}
40+
} while($sas.IndexOf('/') -ne -1)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ steps:
2828
# Calculate the expiration of the SAS token and convert to UTC
2929
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3030
31-
$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
31+
# Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
32+
# of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
33+
$sas = ""
34+
do {
35+
$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
36+
if ($LASTEXITCODE -ne 0) {
37+
Write-Error "Failed to generate SAS token."
38+
exit 1
39+
}
40+
} while($sas.IndexOf('/') -ne -1)
3241
3342
if ($LASTEXITCODE -ne 0) {
3443
Write-Error "Failed to generate SAS token."

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"version": "8.0.110"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
18-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1",
19-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
18+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24516.1",
19+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1",
2020
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2121
"Microsoft.NET.Sdk.IL": "8.0.11-servicing.24514.23"
2222
},

0 commit comments

Comments
 (0)