Skip to content

Commit 6a6000a

Browse files
authored
[release/8.0] Update remnants of azureedge.net (#60264)
* [release/8.0] Update remnants of azureedge.net * Update storage domains
1 parent fdeed3e commit 6a6000a

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.azure/pipelines/ci.yml

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

eng/common/templates-official/steps/source-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ steps:
4444
# in the default public locations.
4545
internalRuntimeDownloadArgs=
4646
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
47-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
47+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4848
fi
4949
5050
buildConfig=Release

eng/common/templates/steps/source-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ steps:
4444
# in the default public locations.
4545
internalRuntimeDownloadArgs=
4646
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
47-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
47+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4848
fi
4949
5050
buildConfig=Release

eng/helix/helix.proj

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
5858
<PackageType>runtime</PackageType>
5959
</AdditionalDotNetPackage>
60-
61-
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
60+
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ 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)" />
563+
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/$(DotNetRuntimeDownloadPath)" />
564564
<UrisToDownload Include="https://ci.dot.net/public/$(DotNetRuntimeDownloadPath)" />
565565
<UrisToDownload Include="https://ci.dot.net/internal/$(DotNetRuntimeDownloadPath)"
566566
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">

src/Installers/Windows/WindowsHostingBundle/Product.targets

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

0 commit comments

Comments
 (0)