Skip to content

Commit f666082

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#4068)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent df35cbe commit f666082

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
@@ -91,29 +91,29 @@
9191
</Dependency>
9292
</ProductDependencies>
9393
<ToolsetDependencies>
94-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24508.1">
94+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24516.1">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
96+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24508.1">
98+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.24516.1">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
100+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24508.1">
102+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24516.1">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
104+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24508.1">
106+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.24516.1">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
108+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.24508.1">
110+
<Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.24516.1">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
112+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.24508.1">
114+
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.24516.1">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
116+
<Sha>f7fb1fec01b91be69e4dcc5290a0bff3f28e214f</Sha>
117117
</Dependency>
118118
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.24474.1">
119119
<Uri>https://github.com/dotnet/dnceng</Uri>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
1010
<MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-preview.1</MicrosoftNetFrameworkReferenceAssembliesVersion>
1111
<!-- Libs -->
12-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24508.1</MicrosoftDotNetSignToolVersion>
13-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksFeedVersion>
14-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.24508.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
15-
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24508.1</MicrosoftDotNetGitIssueManagerVersion>
16-
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24508.1</MicrosoftDotNetVersionToolsVersion>
12+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.24516.1</MicrosoftDotNetSignToolVersion>
13+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24516.1</MicrosoftDotNetBuildTasksFeedVersion>
14+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.24516.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
15+
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.24516.1</MicrosoftDotNetGitIssueManagerVersion>
16+
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.24516.1</MicrosoftDotNetVersionToolsVersion>
1717
<MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
1818
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.24376.1</MicrosoftDotNetInternalLoggingVersion>
1919
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.24376.1</MicrosoftAspNetCoreApiPaginationVersion>

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
}
1616
},
1717
"msbuild-sdks": {
18-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1"
18+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1"
1919
}
2020
}

0 commit comments

Comments
 (0)