Skip to content

Commit b8a313e

Browse files
authored
Revert "Revert "[release/9.0] Update remnants of azureedge.net" (#60323)"
This reverts commit ea2a0ca.
1 parent eeb8b14 commit b8a313e

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.azure/pipelines/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ variables:
9797
- name: WindowsArm64InstallersLogArgs
9898
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
9999
- name: _InternalRuntimeDownloadArgs
100-
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
100+
value: -RuntimeSourceFeed https://ci.dot.net/internal
101101
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
102102
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
103103
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
104104
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
105105
- name: _InternalRuntimeDownloadCodeSignArgs
106106
value: $(_InternalRuntimeDownloadArgs)
107-
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
107+
/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
108108
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
109109
- group: DotNet-HelixApi-Access
110110
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:

eng/helix/helix.proj

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
<PackageType>runtime</PackageType>
5959
</AdditionalDotNetPackage>
6060

61-
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
61+
<AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
6262
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
6363
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
6464
</AdditionalDotNetPackageFeed>
6565

66-
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
66+
<AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
6767
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
6868
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
6969
</AdditionalDotNetPackageFeed>

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -560,9 +560,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
560560
<!-- Try various places to find the runtime. It's either released (use official version),
561561
public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
562562
<ItemGroup>
563-
<UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/$(DotNetRuntimeDownloadPath)" />
564-
<UrisToDownload Include="https://dotnetbuilds.azureedge.net/public/$(DotNetRuntimeDownloadPath)" />
565-
<UrisToDownload Include="https://dotnetbuilds.azureedge.net/internal/$(DotNetRuntimeDownloadPath)"
563+
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/$(DotNetRuntimeDownloadPath)" />
564+
<UrisToDownload Include="https://ci.dot.net/public/$(DotNetRuntimeDownloadPath)" />
565+
<UrisToDownload Include="https://ci.dot.net/internal/$(DotNetRuntimeDownloadPath)"
566566
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
567567
<token>$(DotnetRuntimeSourceFeedKey)</token>
568568
</UrisToDownload>

src/Installers/Windows/WindowsHostingBundle/Product.targets

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
-->
8484
<ItemGroup>
8585
<UrisToDownload Remove="@(UrisToDownload)" />
86-
<UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/Runtime/%(RemoteAsset.Identity)" />
87-
<UrisToDownload Include="https://dotnetbuilds.azureedge.net/public/Runtime/%(RemoteAsset.Identity)" />
88-
<UrisToDownload Include="https://dotnetbuilds.azureedge.net/internal/Runtime/%(RemoteAsset.Identity)"
86+
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/Runtime/%(RemoteAsset.Identity)" />
87+
<UrisToDownload Include="https://ci.dot.net/public/Runtime/%(RemoteAsset.Identity)" />
88+
<UrisToDownload Include="https://ci.dot.net/internal/Runtime/%(RemoteAsset.Identity)"
8989
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
9090
<token>$(DotnetRuntimeSourceFeedKey)</token>
9191
</UrisToDownload>

0 commit comments

Comments
 (0)