File tree Expand file tree Collapse file tree 4 files changed +3
-13
lines changed
common/core-templates/steps Expand file tree Collapse file tree 4 files changed +3
-13
lines changed Original file line number Diff line number Diff line change 4
4
<clear />
5
5
<!-- Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6
6
<!-- Begin: Package sources from dotnet-runtime -->
7
- <add key =" darc-pub-dotnet-runtime-d398172" value =" https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
8
7
<!-- End: Package sources from dotnet-runtime -->
9
8
<!-- End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
10
9
<add key =" dotnet-eng" value =" https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Original file line number Diff line number Diff line change @@ -31,16 +31,7 @@ steps:
31
31
# Calculate the expiration of the SAS token and convert to UTC
32
32
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
33
33
34
- # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads
35
- # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484
36
- $sas = ""
37
- do {
38
- $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
39
- if ($LASTEXITCODE -ne 0) {
40
- Write-Error "Failed to generate SAS token."
41
- exit 1
42
- }
43
- } while($sas.IndexOf('/') -ne -1)
34
+ $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
44
35
45
36
if ($LASTEXITCODE -ne 0) {
46
37
Write-Error "Failed to generate SAS token."
Original file line number Diff line number Diff line change 30
30
<SasToken >$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken >
31
31
</AdditionalDotNetPackageFeed >
32
32
33
- <AdditionalDotNetPackage Include =" $(MicrosoftNETCoreBrowserDebugHostTransportVersion )" >
33
+ <AdditionalDotNetPackage Include =" $(MicrosoftNETCoreAppRuntimewinx64Version )" >
34
34
<PackageType >runtime</PackageType >
35
35
</AdditionalDotNetPackage >
36
36
</ItemGroup >
Original file line number Diff line number Diff line change 8
8
"dotnet" : " 9.0.100-rc.2.24474.11" ,
9
9
"runtimes" : {
10
10
"dotnet" : [
11
- " $(MicrosoftNETCoreBrowserDebugHostTransportVersion )"
11
+ " $(MicrosoftNETCoreAppRuntimewinx64Version )"
12
12
]
13
13
}
14
14
},
You can’t perform that action at this time.
0 commit comments