Merge branch 'main' into templates

Author: captainsafia

.azure/pipelines/ci-public.yml

@@ -392,7 +392,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-net10.0-build-amd64
       buildArgs:
         --arch x64
         --os-name linux-musl
@@ -426,7 +426,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-net10.0-build-amd64
       buildArgs:
         --arch arm
         --os-name linux-musl
@@ -459,7 +459,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-net10.0-build-amd64
       buildArgs:
         --arch arm64
         --os-name linux-musl
@@ -629,7 +629,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-net10.0-build-amd64'
         buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
         skipPublishValidation: true
         jobProperties:

.azure/pipelines/ci.yml

@@ -125,12 +125,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
+      azureLinux30Net10BuildAmd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
     stages:
     - stage: build
       displayName: Build
@@ -445,7 +441,7 @@ extends:
           jobName: Linux_musl_x64_build
           jobDisplayName: "Build: Linux Musl x64"
           agentOs: Linux
-          container: alpine319WithNode
+          container: azureLinux30Net10BuildAmd64
           buildArgs:
             --arch x64
             --os-name linux-musl
@@ -479,7 +475,7 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM"
           agentOs: Linux
           useHostedUbuntu: false
-          container: mariner20CrossArmAlpine
+          container: azureLinux30Net10BuildAmd64
           buildArgs:
             --arch arm
             --os-name linux-musl
@@ -512,7 +508,7 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM64"
           agentOs: Linux
           useHostedUbuntu: false
-          container: mariner20CrossArm64Alpine
+          container: azureLinux30Net10BuildAmd64
           buildArgs:
             --arch arm64
             --os-name linux-musl

.azure/pipelines/localization.yml

@@ -25,13 +25,42 @@ parameters:
 variables:
 - name: _TeamName
   value: AspNetCore
-- template: /eng/common/templates/variables/pool-providers.yml
-
-jobs:
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
-  - template: /eng/common/templates/job/onelocbuild.yml
-    parameters:
-      CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
-      LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
-      LclSource: lclFilesFromPackage
-      MirrorRepo: aspnetcore
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
+
+
+resources:
+  repositories:
+  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
+      codeql:
+        compiled:
+          enabled: false
+          justificationForDisabling: "This pipeline doesn't build any code. The product code is already scanned in the main pipeline (aspnetcore-ci)"
+    pool:
+      name: $(DncEngInternalBuildPool)
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+    - stage: build
+      displayName: Build
+      jobs:
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
+        - template: /eng/common/templates-official/job/onelocbuild.yml@self
+          parameters:
+            CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
+            LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
+            LclSource: lclFilesFromPackage
+            MirrorRepo: aspnetcore

.github/policies/resourceManagement.yml

@@ -1,3 +1,4 @@
+# Policybot docs live at https://eng.ms/docs/more/github-inside-microsoft/policies/resource-management
 id: 
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
@@ -377,18 +378,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview2
+          milestone: 10.0-preview3
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview1
+          branch: release/10.0-preview2
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview1
+          milestone: 10.0-preview2
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues
@@ -550,7 +551,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0.3
+          milestone: 9.0.4
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -561,7 +562,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.14
+          milestone: 8.0.15
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues