Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-d999caaf-3884-4872-88dd-5ecd1d647d40

Author: SimonZhao888

.vsts-ci.yml

@@ -63,18 +63,20 @@ extends:
     template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
   parameters:
     containers:
-      alpine319WithNode:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
-      cblMariner20Fpm:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
+      alpine322:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
+      azureLinux30:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-build-amd64
+      azureLinux30fpm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-fpm-amd64
       centosStream9:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
       debian12Amd64:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
-      fedora39:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
-      mariner20CrossArm:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
+      fedora41:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
+      azureLinux30CrossArm:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine
       ubuntu2204DebPkg:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
     sdl:
@@ -207,14 +209,14 @@ extends:
               osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
               runTests: false
             - categoryName: Portable
-              container: cblMariner20Fpm
+              container: azureLinux30fpm
               # Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
               publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
               officialBuildProperties: $(_officialBuildProperties)
               osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
               runTests: false
             - categoryName: Portable
-              container: cblMariner20Fpm
+              container: azureLinux30fpm
               buildArchitecture: arm64
               runtimeIdentifier: linux-arm64
               # Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
@@ -224,7 +226,7 @@ extends:
               runTests: false
             ### MUSL ###
             - categoryName: Musl
-              container: alpine319WithNode
+              container: alpine322
               runtimeIdentifier: linux-musl-x64
               publishArgument: $(_publishArgument)
               officialBuildProperties: $(_officialBuildProperties)
@@ -234,7 +236,7 @@ extends:
               enableSbom: false
               runTests: false
             - categoryName: Musl
-              container: mariner20CrossArm
+              container: azureLinux30CrossArm
               buildArchitecture: arm
               runtimeIdentifier: linux-musl-arm
               publishArgument: $(_publishArgument)

.vsts-pr.yml

@@ -16,14 +16,14 @@ variables:
 
 resources:
   containers:
-  - container: alpine319WithNode
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+  - container: alpine322
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
   - container: centosStream9
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
   - container: debian12Amd64
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
-  - container: fedora39
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
+  - container: fedora41
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
   - container: ubuntu2204DebPkg
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
 

eng/Versions.props

@@ -6,7 +6,7 @@
     <VersionMajor>9</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>1</VersionSDKMinor>
-    <VersionFeature>10</VersionFeature>
+    <VersionFeature>11</VersionFeature>
     <!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
          It should always be the hundreds-value of the current SDK version, never any
          preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->

eng/pipelines/templates/jobs/sdk-build.yml

@@ -108,6 +108,7 @@ jobs:
         displayName: Build
         env:
           BuildConfig: $(buildConfiguration)
+          OPENSSL_ENABLE_SHA1_SIGNATURES: 1
 
     ############### TESTING ###############
     - ${{ if eq(parameters.runTests, true) }}:

eng/pipelines/templates/jobs/sdk-job-matrix.yml

@@ -35,7 +35,7 @@ parameters:
     # See: https://github.com/dotnet/sdk/issues/40935
     runTests: false
   - categoryName: ContainerBased
-    container: fedora39
+    container: fedora41
     # No fedora Helix container is available, so use the ubuntu one instead.
     helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64
     osProperties: $(linuxOsPortableProperties)
@@ -57,7 +57,7 @@ parameters:
     # See: https://github.com/dotnet/sdk/issues/40935
     runTests: false
   - categoryName: ContainerBased
-    container: alpine319WithNode
+    container: alpine322
     helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.18-helix-amd64
     runtimeIdentifier: linux-musl-x64
     # Use HostOSName when running on alpine.

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

@@ -34,7 +34,7 @@
 
       <NetRuntimeRid Condition="'$(NetRuntimeRid)' == ''">$(HostRid)</NetRuntimeRid>
       <NetRuntimeRid Condition=" ('$(OSName)' == 'win' or '$(OSName)' == 'osx' or '$(OSName)' == 'freebsd') and '$(DotNetBuildSourceOnly)' != 'true' ">$(OSName)-$(Architecture)</NetRuntimeRid>
-      <NetRuntimeRid Condition="'$(DotNetBuild)' != 'true' and $(NetRuntimeRid.StartsWith('mariner.2.0'))">$(HostRid.Replace('mariner.2.0', 'cm.2'))</NetRuntimeRid>
+      <NetRuntimeRid Condition="'$(DotNetBuild)' != 'true' and $(NetRuntimeRid.StartsWith('azurelinux.3.0'))">$(HostRid.Replace('azurelinux.3.0', 'azl.3'))</NetRuntimeRid>
 
       <!-- only the runtime OSX .pkgs have a `-internal` suffix -->
       <InstallerStartSuffix Condition="$([MSBuild]::IsOSPlatform('OSX'))">-internal</InstallerStartSuffix>