Skip to content

Commit 1edafc4

Browse files
wtgodbewtgodbe
committed
Merged PR 47512: [internal/release/9.0] Merge from public
Fixes some merge conflicts ---- #### AI description (iteration 1) #### PR Classification Code cleanup and dependency updates. #### PR Summary This pull request updates dependencies and cleans up configuration files to align with the latest internal and public build sources. - Updated dependency versions in `/eng/Version.Details.xml` and `/eng/Versions.props`. - Changed container images in `.azure/pipelines/ci.yml` and `.azure/pipelines/ci-public.yml` to `azurelinux-3.0-net9.0-build-amd64`. - Updated runtime download URLs in `/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj`, `/eng/helix/helix.proj`, and `/src/Installers/Windows/WindowsHostingBundle/Product.targets`. - Modified `BuildOsName` condition in `/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj` for `linux-musl` builds. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
1 parent 86ab608 commit 1edafc4

File tree

8 files changed

+29
-33
lines changed

8 files changed

+29
-33
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ stages:
446446
jobName: Linux_musl_x64_build
447447
jobDisplayName: "Build: Linux Musl x64"
448448
agentOs: Linux
449-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
449+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
450450
buildArgs:
451451
--arch x64
452452
--os-name linux-musl
@@ -480,7 +480,7 @@ stages:
480480
jobDisplayName: "Build: Linux Musl ARM"
481481
agentOs: Linux
482482
useHostedUbuntu: false
483-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
483+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
484484
buildArgs:
485485
--arch arm
486486
--os-name linux-musl
@@ -513,7 +513,7 @@ stages:
513513
jobDisplayName: "Build: Linux Musl ARM64"
514514
agentOs: Linux
515515
useHostedUbuntu: false
516-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
516+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
517517
buildArgs:
518518
--arch arm64
519519
--os-name linux-musl
@@ -645,7 +645,7 @@ stages:
645645
parameters:
646646
platform:
647647
name: 'Managed'
648-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
648+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64'
649649
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
650650
skipPublishValidation: true
651651
jobProperties:

‎.azure/pipelines/ci.yml‎

Lines changed: 7 additions & 11 deletions
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') }}:
@@ -149,12 +149,8 @@ extends:
149149
tsa:
150150
enabled: true
151151
containers:
152-
alpine319WithNode:
153-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
154-
mariner20CrossArmAlpine:
155-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
156-
mariner20CrossArm64Alpine:
157-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
152+
azureLinux30Net9BuildAmd64:
153+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
158154
stages:
159155
- stage: build
160156
displayName: Build
@@ -515,7 +511,7 @@ extends:
515511
jobName: Linux_musl_x64_build
516512
jobDisplayName: "Build: Linux Musl x64"
517513
agentOs: Linux
518-
container: alpine319WithNode
514+
container: azureLinux30Net9BuildAmd64
519515
buildArgs:
520516
--arch x64
521517
--os-name linux-musl
@@ -549,7 +545,7 @@ extends:
549545
jobDisplayName: "Build: Linux Musl ARM"
550546
agentOs: Linux
551547
useHostedUbuntu: false
552-
container: mariner20CrossArmAlpine
548+
container: azureLinux30Net9BuildAmd64
553549
buildArgs:
554550
--arch arm
555551
--os-name linux-musl
@@ -582,7 +578,7 @@ extends:
582578
jobDisplayName: "Build: Linux Musl ARM64"
583579
agentOs: Linux
584580
useHostedUbuntu: false
585-
container: mariner20CrossArm64Alpine
581+
container: azureLinux30Net9BuildAmd64
586582
buildArgs:
587583
--arch arm64
588584
--os-name linux-musl

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,13 +414,13 @@
414414
<Uri>https://github.com/dotnet/arcade</Uri>
415415
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
416416
</Dependency>
417-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.2.0-preview.1.25080.2">
417+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0-preview.1.25107.9">
418418
<Uri>https://github.com/dotnet/extensions</Uri>
419-
<Sha>cc2317e220509a75fe457fc73ac83091c2b531ce</Sha>
419+
<Sha>ca2fe808b3d6c55817467f46ca58657456b4a928</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.2.0-preview.1.25080.2">
421+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.3.0-preview.1.25107.9">
422422
<Uri>https://github.com/dotnet/extensions</Uri>
423-
<Sha>cc2317e220509a75fe457fc73ac83091c2b531ce</Sha>
423+
<Sha>ca2fe808b3d6c55817467f46ca58657456b4a928</Sha>
424424
</Dependency>
425425
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
426426
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
<SystemIOHashingVersion>9.0.2</SystemIOHashingVersion>
144144
<SystemRuntimeCachingVersion>9.0.2</SystemRuntimeCachingVersion>
145145
<!-- Packages from dotnet/extensions -->
146-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.2.0-preview.1.25080.2</MicrosoftExtensionsDiagnosticsTestingVersion>
147-
<MicrosoftExtensionsTimeProviderTestingVersion>9.2.0-preview.1.25080.2</MicrosoftExtensionsTimeProviderTestingVersion>
146+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.3.0-preview.1.25107.9</MicrosoftExtensionsDiagnosticsTestingVersion>
147+
<MicrosoftExtensionsTimeProviderTestingVersion>9.3.0-preview.1.25107.9</MicrosoftExtensionsTimeProviderTestingVersion>
148148
<!-- Packages from dotnet/efcore -->
149149
<dotnetefVersion>9.0.2</dotnetefVersion>
150150
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.2</MicrosoftEntityFrameworkCoreInMemoryVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ steps:
3737
# in the default public locations.
3838
internalRuntimeDownloadArgs=
3939
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
40-
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)'
40+
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)'
4141
fi
4242
4343
buildConfig=Release

‎eng/helix/helix.proj‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
100100
<RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName>
101101

102102
<!--
103-
Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
104-
are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container.
103+
Determine the crossgen2 package path property name. Special case linux-musl because they are built
104+
on an Ubuntu container with cross compilation tools.
105105
Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
106106
-->
107107
<BuildOsName>$(TargetOsName)</BuildOsName>
108-
<BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64'">linux</BuildOsName>
108+
<BuildOsName Condition="'$(TargetOsName)' == 'linux-musl'">linux</BuildOsName>
109109
<BuildOsName Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName>
110110
<Crossgen2BuildArchitecture Condition=" '$(BuildOsName)' == 'win' ">x64</Crossgen2BuildArchitecture>
111111
<Crossgen2BuildArchitecture Condition=" '$(Crossgen2BuildArchitecture)' == '' ">$(BuildArchitecture)</Crossgen2BuildArchitecture>
@@ -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‎

Lines changed: 3 additions & 3 deletions
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)