Skip to content

Commit 061d34f

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20241016.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1
1 parent aba2f63 commit 061d34f

File tree

5 files changed

+32
-14
lines changed

5 files changed

+32
-14
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
496+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24508.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24516.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
501+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24508.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24516.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
505+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24508.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24516.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
509+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24508.1</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24516.1</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -209,7 +209,7 @@
209209
<PropertyGroup>
210210
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
211211
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
212-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24508.1</MicrosoftDotNetXUnitExtensionsVersion>
212+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24516.1</MicrosoftDotNetXUnitExtensionsVersion>
213213
<MoqPackageVersion>4.18.4</MoqPackageVersion>
214214
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
215215
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1"
1919
}
2020
}

0 commit comments

Comments
 (0)