Skip to content

Commit ce392ed

Browse files
authored
Replace deprecated blob storage URLs with canonical domains (#51915)
2 parents 7cb7ff3 + b8202e7 commit ce392ed

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.vsts-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extends:
105105
oneESCompat:
106106
templateFolderName: templates-official
107107
publishTaskPrefix: 1ES.
108-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
108+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
109109
locBranch: release/9.0.2xx
110110
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
111111
timeoutInMinutes: 90
@@ -175,7 +175,7 @@ extends:
175175
oneESCompat:
176176
templateFolderName: templates-official
177177
publishTaskPrefix: 1ES.
178-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
178+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
179179
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
180180
timeoutInMinutes: 90
181181
linuxJobParameterSets:
@@ -277,7 +277,7 @@ extends:
277277
oneESCompat:
278278
templateFolderName: templates-official
279279
publishTaskPrefix: 1ES.
280-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
280+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
281281
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
282282
timeoutInMinutes: 90
283283
macOSJobParameterSets:
@@ -310,7 +310,7 @@ extends:
310310
parameters:
311311
oneESCompat:
312312
publishTaskPrefix: 1ES.
313-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
313+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
314314

315315
############### PUBLISH STAGE ###############
316316
- ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</PropertyGroup>
4343
<PropertyGroup Label="Restore feeds">
4444
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
45-
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetbuilds.blob.core.windows.net/public/</DotNetAssetRootUrl>
45+
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://ci.dot.net/public/</DotNetAssetRootUrl>
4646
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
4747
</PropertyGroup>
4848
<PropertyGroup Label="Production dependencies">

src/Installer/redist-installer/targets/GenerateLayout.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)\</SdkOutputDirectory>
2525

2626
<InternalBuild Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">true</InternalBuild>
27-
<InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://dotnetbuilds.blob.core.windows.net/internal/</InternalBaseURL>
27+
<InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://ci.dot.net/internal/</InternalBaseURL>
2828

2929
<!-- Base url for official releases. Used to obtain some assets from older releases when necessary. -->
30-
<OfficialBaseURL>https://dotnetcli.blob.core.windows.net/dotnet/</OfficialBaseURL>
30+
<OfficialBaseURL>https://builds.dotnet.microsoft.com/dotnet/</OfficialBaseURL>
3131
<PublicBaseURL Condition="'$(PublicBaseURL)' == ''">$(OfficialBaseURL)</PublicBaseURL>
3232
<!-- MSBuild removes the '//' slashes when passing PublicBaseURL from the outer to the inner build. -->
3333
<PublicBaseURL Condition="$(PublicBaseURL.StartsWith('file:')) and '$(OS)' != 'Windows_NT'">$([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242'))</PublicBaseURL>
@@ -390,10 +390,10 @@
390390
<!-- If building in product source build mode, there is no need to attempt the external URIs. These are not desired,
391391
and won't work anyway because the source build file URI doesn't use the same structure as the storage accounts.
392392
For example, the dotnetbuilds uri for 'file:///vmr/dotnet2/artifacts/obj/x64/Release/blob-feed/assets//aspnetcore_base_runtime.version'
393-
would end up 'https://dotnetbuilds.blob.core.windows.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is
393+
would end up 'https://ci.dot.net/public//dotnet-runtime-8.0.0-rc.1.23381.3-centos.8-x64.tar.gz'. This is
394394
missing the runtime version number directory. -->
395395
<ItemGroup Condition="'$(DotNetBuildOrchestrator)' != 'true'">
396-
<UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://dotnetbuilds.blob.core.windows.net/public/'))/%(ComponentToDownload.DownloadFileName)"
396+
<UrisToDownload Include="$([System.String]::Copy('%(ComponentToDownload.BaseUrl)').Replace($(PublicBaseURL), 'https://ci.dot.net/public/'))/%(ComponentToDownload.DownloadFileName)"
397397
Condition="'%(ComponentToDownload.ShouldDownload)' == 'true'">
398398
<ShouldDownload>%(ComponentToDownload.ShouldDownload)</ShouldDownload>
399399
<DownloadDestination>%(ComponentToDownload.DownloadDestination)</DownloadDestination>

src/SourceBuild/content/repo-projects/sdk.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<BuildArgs>$(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsAssetsDir)</BuildArgs>
3636
<!-- In non-source-only scenarios, currently consume aspnetcore from the normal public base url -->
37-
<BuildArgs>$(BuildArgs) /p:FallbackPublicBaseURL=https://dotnetbuilds.blob.core.windows.net/public/</BuildArgs>
37+
<BuildArgs>$(BuildArgs) /p:FallbackPublicBaseURL=https://ci.dot.net/public/</BuildArgs>
3838
<BuildArgs>$(BuildArgs) /p:UsePortableLinuxSharedFramework=false</BuildArgs>
3939

4040
<BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) /p:PgoInstrument=true</BuildArgs>

0 commit comments

Comments
 (0)