Skip to content

Revert "[release/8.0] Update remnants of azureedge.net" #60324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Revert "[release/8.0] Update remnants of azureedge.net" #60324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02c46dd
Revert "[release/8.0] Update remnants of azureedge.net (#60264)"
wtgodbe Feb 12, 2025
9f64544
Update eng/common/templates/steps/source-build.yml
wtgodbe Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ variables:
- name: WindowsArm64InstallersLogArgs
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
- name: _InternalRuntimeDownloadArgs
value: -RuntimeSourceFeed https://ci.dot.net/internal
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
- name: _InternalRuntimeDownloadCodeSignArgs
value: $(_InternalRuntimeDownloadArgs)
/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
- group: DotNet-HelixApi-Access
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ steps:
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
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)'
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)'
fi

buildConfig=Release
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/steps/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ steps:
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
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)'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These can stay the same.

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)'
fi

buildConfig=Release
Expand Down
6 changes: 3 additions & 3 deletions eng/helix/helix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
<PackageType>runtime</PackageType>
</AdditionalDotNetPackage>

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

<AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
<AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
</AdditionalDotNetPackageFeed>
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
<!-- Try various places to find the runtime. It's either released (use official version),
public but un-released (use dotnetbuilds/public), or internal and unreleased (use dotnetbuilds/internal) -->
<ItemGroup>
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/$(DotNetRuntimeDownloadPath)" />
<UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/$(DotNetRuntimeDownloadPath)" />
<UrisToDownload Include="https://ci.dot.net/public/$(DotNetRuntimeDownloadPath)" />
<UrisToDownload Include="https://ci.dot.net/internal/$(DotNetRuntimeDownloadPath)"
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
Expand All @@ -568,7 +568,7 @@
</UrisToDownload>
</ItemGroup>

<DownloadFile Condition=" !Exists('$(DotNetRuntimeArchive)') "

Check failure on line 571 in src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: macOS x64)

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

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj(571,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) Download from all targets failed. List of attempted targets: https://dotnetcli.azureedge.net/dotnet/Runtime/8.0.12-servicing.24603.5/dotnet-runtime-8.0.12-osx-x64.tar.gz, https://ci.dot.net/public/Runtime/8.0.12-servicing.24603.5/dotnet-runtime-8.0.12-osx-x64.tar.gz

Check failure on line 571 in src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

View check run for this annotation

Azure Pipelines / aspnetcore-ci (Build Build: macOS x64)

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

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj(571,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) Failed to download file using addresses in Uri and/or Uris.
Uris="@(UrisToDownload)"
DestinationPath="$(DotNetRuntimeArchive)" />

Expand Down
2 changes: 1 addition & 1 deletion src/Installers/Windows/WindowsHostingBundle/Product.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
-->
<ItemGroup>
<UrisToDownload Remove="@(UrisToDownload)" />
<UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/Runtime/%(RemoteAsset.Identity)" />
<UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/Runtime/%(RemoteAsset.Identity)" />
<UrisToDownload Include="https://ci.dot.net/public/Runtime/%(RemoteAsset.Identity)" />
<UrisToDownload Include="https://ci.dot.net/internal/Runtime/%(RemoteAsset.Identity)"
Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
Expand Down
Loading