diff --git a/.vsts-ci.yml b/.vsts-ci.yml index def621bfebaa..a33f0adc1e59 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -105,7 +105,7 @@ extends: oneESCompat: templateFolderName: templates-official publishTaskPrefix: 1ES. - runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) locBranch: release/9.0.2xx ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: timeoutInMinutes: 90 @@ -175,7 +175,7 @@ extends: oneESCompat: templateFolderName: templates-official publishTaskPrefix: 1ES. - runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: timeoutInMinutes: 90 linuxJobParameterSets: @@ -277,7 +277,7 @@ extends: oneESCompat: templateFolderName: templates-official publishTaskPrefix: 1ES. - runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: timeoutInMinutes: 90 macOSJobParameterSets: @@ -310,7 +310,7 @@ extends: parameters: oneESCompat: publishTaskPrefix: 1ES. - runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) ############### PUBLISH STAGE ############### - ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/Versions.props b/eng/Versions.props index 38445d86c14d..2914ca4bce70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ - https://dotnetbuilds.blob.core.windows.net/public/ + https://ci.dot.net/public/ https://dotnetclimsrc.blob.core.windows.net/dotnet/ diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets index d2be6f6850da..0daea94a2cb8 100644 --- a/src/Installer/redist-installer/targets/GenerateLayout.targets +++ b/src/Installer/redist-installer/targets/GenerateLayout.targets @@ -24,10 +24,10 @@ $(RedistLayoutPath)sdk\$(Version)\ true - https://dotnetbuilds.blob.core.windows.net/internal/ + https://ci.dot.net/internal/ - https://dotnetcli.blob.core.windows.net/dotnet/ + https://builds.dotnet.microsoft.com/dotnet/ $(OfficialBaseURL) $([System.Text.RegularExpressions.Regex]::Replace('$(PublicBaseURL)', '%28file:\/{1,}%29%28.+%29', 'file:///%242')) @@ -390,10 +390,10 @@ - %(ComponentToDownload.ShouldDownload) %(ComponentToDownload.DownloadDestination) diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 858678e015ac..86e9c6cb5b13 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -34,7 +34,7 @@ $(BuildArgs) /p:PublicBaseURL=file:%2F%2F$(ArtifactsAssetsDir) - $(BuildArgs) /p:FallbackPublicBaseURL=https://dotnetbuilds.blob.core.windows.net/public/ + $(BuildArgs) /p:FallbackPublicBaseURL=https://ci.dot.net/public/ $(BuildArgs) /p:UsePortableLinuxSharedFramework=false $(BuildArgs) /p:PgoInstrument=true