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 -->

.azure/pipelines/ci-public.yml

@@ -446,7 +446,7 @@ stages:
       jobName: Linux_musl_x64_build
       jobDisplayName: "Build: Linux Musl x64"
       agentOs: Linux
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
       buildArgs:
         --arch x64
         --os-name linux-musl
@@ -480,7 +480,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM"
       agentOs: Linux
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
       buildArgs:
         --arch arm
         --os-name linux-musl
@@ -513,7 +513,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM64"
       agentOs: Linux
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
       buildArgs:
         --arch arm64
         --os-name linux-musl
@@ -645,7 +645,7 @@ stages:
     parameters:
       platform:
         name: 'Managed'
-        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+        container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64'
         buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
         skipPublishValidation: true
         jobProperties:

.azure/pipelines/ci.yml

@@ -97,14 +97,14 @@ variables:
   - name: WindowsArm64InstallersLogArgs
     value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _InternalRuntimeDownloadArgs
-  value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
+  value: -RuntimeSourceFeed https://ci.dot.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://dotnetbuilds.blob.core.windows.net/internal
+         /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
          /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
 - group: DotNet-HelixApi-Access
 - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
@@ -149,12 +149,8 @@ extends:
       tsa:
         enabled: true
     containers:
-      alpine319WithNode:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
-      mariner20CrossArmAlpine:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
-      mariner20CrossArm64Alpine:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
+      azureLinux30Net9BuildAmd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
     stages:
     - stage: build
       displayName: Build
@@ -515,7 +511,7 @@ extends:
           jobName: Linux_musl_x64_build
           jobDisplayName: "Build: Linux Musl x64"
           agentOs: Linux
-          container: alpine319WithNode
+          container: azureLinux30Net9BuildAmd64
           buildArgs:
             --arch x64
             --os-name linux-musl
@@ -549,7 +545,7 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM"
           agentOs: Linux
           useHostedUbuntu: false
-          container: mariner20CrossArmAlpine
+          container: azureLinux30Net9BuildAmd64
           buildArgs:
             --arch arm
             --os-name linux-musl
@@ -582,7 +578,7 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM64"
           agentOs: Linux
           useHostedUbuntu: false
-          container: mariner20CrossArm64Alpine
+          container: azureLinux30Net9BuildAmd64
           buildArgs:
             --arch arm64
             --os-name linux-musl

eng/Version.Details.xml

@@ -414,13 +414,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.2.0-preview.1.25080.2">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0-preview.1.25107.9">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>cc2317e220509a75fe457fc73ac83091c2b531ce</Sha>
+      <Sha>ca2fe808b3d6c55817467f46ca58657456b4a928</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.2.0-preview.1.25080.2">
+    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.3.0-preview.1.25107.9">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>cc2317e220509a75fe457fc73ac83091c2b531ce</Sha>
+      <Sha>ca2fe808b3d6c55817467f46ca58657456b4a928</Sha>
     </Dependency>
     <Dependency Name="NuGet.Frameworks" Version="6.2.4">
       <Uri>https://github.com/nuget/nuget.client</Uri>

eng/Versions.props

@@ -143,8 +143,8 @@
     <SystemIOHashingVersion>9.0.2</SystemIOHashingVersion>
     <SystemRuntimeCachingVersion>9.0.2</SystemRuntimeCachingVersion>
     <!-- Packages from dotnet/extensions -->
-    <MicrosoftExtensionsDiagnosticsTestingVersion>9.2.0-preview.1.25080.2</MicrosoftExtensionsDiagnosticsTestingVersion>
-    <MicrosoftExtensionsTimeProviderTestingVersion>9.2.0-preview.1.25080.2</MicrosoftExtensionsTimeProviderTestingVersion>
+    <MicrosoftExtensionsDiagnosticsTestingVersion>9.3.0-preview.1.25107.9</MicrosoftExtensionsDiagnosticsTestingVersion>
+    <MicrosoftExtensionsTimeProviderTestingVersion>9.3.0-preview.1.25107.9</MicrosoftExtensionsTimeProviderTestingVersion>
     <!-- Packages from dotnet/efcore -->
     <dotnetefVersion>9.0.2</dotnetefVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.2</MicrosoftEntityFrameworkCoreInMemoryVersion>

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

@@ -37,7 +37,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://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)'
+      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)'
     fi
 
     buildConfig=Release

eng/helix/helix.proj

@@ -58,12 +58,12 @@
       <PackageType>runtime</PackageType>
     </AdditionalDotNetPackage>
 
-    <AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
+    <AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
                                  Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
       <SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
     </AdditionalDotNetPackageFeed>
 
-    <AdditionalDotNetPackageFeed Include="https://dotnetbuilds.blob.core.windows.net/internal"
+    <AdditionalDotNetPackageFeed Include="https://ci.dot.net/internal"
                                  Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
       <SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
     </AdditionalDotNetPackageFeed>

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

@@ -100,12 +100,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName>
 
     <!--
-      Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
-      are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container.
+      Determine the crossgen2 package path property name. Special case linux-musl because they are built
+      on an Ubuntu container with cross compilation tools.
       Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
     -->
     <BuildOsName>$(TargetOsName)</BuildOsName>
-    <BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)' != 'x64'">linux</BuildOsName>
+    <BuildOsName Condition="'$(TargetOsName)' == 'linux-musl'">linux</BuildOsName>
     <BuildOsName Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier.Substring(0,$(TargetRuntimeIdentifier.IndexOf('-'))))</BuildOsName>
     <Crossgen2BuildArchitecture Condition=" '$(BuildOsName)' == 'win' ">x64</Crossgen2BuildArchitecture>
     <Crossgen2BuildArchitecture Condition=" '$(Crossgen2BuildArchitecture)' == '' ">$(BuildArchitecture)</Crossgen2BuildArchitecture>
@@ -560,9 +560,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <!-- 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://dotnetcli.azureedge.net/dotnet/$(DotNetRuntimeDownloadPath)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/public/$(DotNetRuntimeDownloadPath)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/internal/$(DotNetRuntimeDownloadPath)"
+      <UrisToDownload Include="https://builds.dotnet.microsoft.com/dotnet/$(DotNetRuntimeDownloadPath)" />
+      <UrisToDownload Include="https://ci.dot.net/public/$(DotNetRuntimeDownloadPath)" />
+      <UrisToDownload Include="https://ci.dot.net/internal/$(DotNetRuntimeDownloadPath)"
           Condition=" '$(DotnetRuntimeSourceFeedKey)' != '' ">
         <token>$(DotnetRuntimeSourceFeedKey)</token>
       </UrisToDownload>

src/Installers/Windows/WindowsHostingBundle/Product.targets

@@ -83,9 +83,9 @@
     -->
     <ItemGroup>
       <UrisToDownload Remove="@(UrisToDownload)" />
-      <UrisToDownload Include="https://dotnetcli.azureedge.net/dotnet/Runtime/%(RemoteAsset.Identity)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/public/Runtime/%(RemoteAsset.Identity)" />
-      <UrisToDownload Include="https://dotnetbuilds.azureedge.net/internal/Runtime/%(RemoteAsset.Identity)"
+      <UrisToDownload Include="https://builds.dotnet.microsoft.com/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)' != '' ">
         <token>$(DotnetRuntimeSourceFeedKey)</token>
       </UrisToDownload>