Skip to content

Commit 4b7c759

Browse files
committed
Revert workarounds
1 parent 785ab0a commit 4b7c759

File tree

4 files changed

+3
-13
lines changed

4 files changed

+3
-13
lines changed

NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- 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" />
87
<!-- End: Package sources from dotnet-runtime -->
98
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
109
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,7 @@ steps:
3131
# Calculate the expiration of the SAS token and convert to UTC
3232
$expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
3333
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
4435
4536
if ($LASTEXITCODE -ne 0) {
4637
Write-Error "Failed to generate SAS token."

eng/helix.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
3131
</AdditionalDotNetPackageFeed>
3232

33-
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
33+
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRuntimewinx64Version)">
3434
<PackageType>runtime</PackageType>
3535
</AdditionalDotNetPackage>
3636
</ItemGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dotnet": "9.0.100-rc.2.24474.11",
99
"runtimes": {
1010
"dotnet": [
11-
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
11+
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
1212
]
1313
}
1414
},

0 commit comments

Comments
 (0)