Merge branch 'main' into wtgodbe/Wix5

Author: wtgodbe

.azure/pipelines/ci-public.yml

@@ -76,8 +76,6 @@ variables:
   value: /bl:artifacts/log/Release/Build.CodeSign.binlog
 - name: WindowsInstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.binlog
-- name: WindowsArm64InstallersLogArgs
-  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _SignType
   value: ''
 - name: _InternalRuntimeDownloadArgs
@@ -205,29 +203,14 @@ stages:
                 -sign
                 -buildInstallers
                 -noBuildNative
-                /p:DotNetSignType=$(_SignType)
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-                $(WindowsInstallersLogArgs)
-        displayName: Build Installers
-
-      # Windows installers bundle and sharedfx msi for arm64
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -noBuildRepoTasks
-                -arch arm64
-                -sign
-                -buildInstallers
-                -noBuildNative
                 -publish
                 /p:DotNetSignType=$(_SignType)
                 /p:AssetManifestFileName=aspnetcore-win.xml
                 $(_BuildArgs)
                 $(_PublishArgs)
                 $(_InternalRuntimeDownloadArgs)
-                $(WindowsArm64InstallersLogArgs)
-        displayName: Build ARM64 Installers
+                $(WindowsInstallersLogArgs)
+        displayName: Build Installers
 
       artifacts:
       - name: Windows_Logs_Attempt_$(System.JobAttempt)

.azure/pipelines/ci.yml

@@ -78,8 +78,6 @@ variables:
   value: /bl:artifacts/log/Release/Build.CodeSign.binlog
 - name: WindowsInstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.binlog
-- name: WindowsArm64InstallersLogArgs
-  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _InternalRuntimeDownloadArgs
   value: -RuntimeSourceFeed https://ci.dot.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -255,33 +253,16 @@ extends:
                     -sign
                     -buildInstallers
                     -noBuildNative
-                    /p:DotNetSignType=$(_SignType)
-                    $(_BuildArgs)
-                    $(_InternalRuntimeDownloadArgs)
-                    $(WindowsInstallersLogArgs)
-            env:
-              MSBUILDUSESERVER: "1"
-            displayName: Build Installers
-
-          # Windows installers bundle and sharedfx msi for arm64
-          - script: ./eng/build.cmd
-                    -ci
-                    -prepareMachine
-                    -noBuildRepoTasks
-                    -arch arm64
-                    -sign
-                    -buildInstallers
-                    -noBuildNative
                     -publish
                     /p:DotNetSignType=$(_SignType)
                     /p:AssetManifestFileName=aspnetcore-win.xml
                     $(_BuildArgs)
                     $(_PublishArgs)
                     $(_InternalRuntimeDownloadArgs)
-                    $(WindowsArm64InstallersLogArgs)
+                    $(WindowsInstallersLogArgs)
             env:
               MSBUILDUSESERVER: "1"
-            displayName: Build ARM64 Installers
+            displayName: Build Installers
 
           artifacts:
           - name: Windows_Logs_Attempt_$(System.JobAttempt)

.azure/pipelines/components-e2e-tests.yml

@@ -98,17 +98,13 @@ jobs:
           exit 1
         fi
       displayName: Run E2E tests
-      env:
-        DOTNET_EnableAVX512: 0
     - script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined=true' -p:RunQuarantinedTests=true
                  -p:VsTestUseMSBuildOutput=false
                  --logger:"trx%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.trx"
                  --logger:"html%3BLogFileName=Microsoft.AspNetCore.Components.E2ETests.html"
                  --results-directory $(Build.SourcesDirectory)/artifacts/TestResults/$(BuildConfiguration)/Quarantined
       displayName: Run Quarantined E2E tests
       continueOnError: true
-      env:
-        DOTNET_EnableAVX512: 0
     - task: PublishTestResults@2
       displayName: Publish E2E Test Results
       inputs:

.azuredevops/pull_request_template/branches/internal.md

@@ -40,6 +40,6 @@ Fixes #{bug number} (in this specific format)
 
 ----
 
-## When servicing release/2.1
+## When servicing release/2.3
 
 - [ ] Make necessary changes in eng/PatchConfig.props

.azuredevops/pull_request_template/branches/release.md

@@ -46,6 +46,6 @@ Fixes #{bug number} (in this specific format)
 
 ----
 
-## When servicing release/2.1
+## When servicing release/2.3
 
 - [ ] Make necessary changes in eng/PatchConfig.props

.github/PULL_REQUEST_TEMPLATE/servicing.md

@@ -40,6 +40,6 @@ Fixes #{bug number} (in this specific format)
 
 ----
 
-## When servicing release/2.1
+## When servicing release/2.3
 
 - [ ] Make necessary changes in eng/PatchConfig.props

.github/policies/resourceManagement.yml

@@ -441,19 +441,30 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-rc1
+          milestone: 11.0-preview1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview7
+          branch: release/10.0-rc1
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview7
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
+          milestone: 10.0-rc1
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-rc1 branch'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Closed
+      - targetsBranch:
+          branch: release/10.0
+      then:
+      - removeMilestone
+      - addMilestone:
+          milestone: 10.0-rc2
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0 branch'
     - if:
       - payloadType: Issues
       - isAction:
@@ -566,6 +577,25 @@ configuration:
 
             Otherwise, please add `tell-mode` label.
       description: Add release/2.3 targeting PRs to the servicing project
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - targetsBranch:
+          branch: release/10.0
+      - activitySenderHasPermission:
+          permission: Read
+      - not:
+          isActivitySender:
+            user: dotnet-maestro
+            issueAuthor: False
+      - not:
+          isActivitySender:
+            user: dotnet-maestro-bot
+            issueAuthor: False
+      then:
+      - addLabel:
+          label: servicing-consider
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -743,3 +773,5 @@ configuration:
 onFailure: 
 onSuccess: 
 
+
+

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@7c0434b26153965459a8d7968f18cf7c0a2cf463 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@f2cdf946c00a12a2c283835bb41ddc2255832055 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%
@@ -63,6 +63,6 @@ jobs:
 
         ----
 
-        ## When servicing release/2.1
+        ## When servicing release/2.3
 
         - [ ] Make necessary changes in eng/PatchConfig.props

.github/workflows/browsertesting-open-issue.yml

@@ -14,7 +14,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # copilot can be assigned to the issue
       # https://cli.github.com/manual/gh_issue_create

.github/workflows/copilot-setup-steps.yml

@@ -14,11 +14,30 @@ jobs:
     # You can define any steps you want, and they will run before the agent starts.
     # If you do not check out your code, Copilot will do this for you.
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
 
-        # Include PrepareForHelix to maximise what is downloaded here
+      # Include PrepareForHelix to maximise what is downloaded here
       - name: Build solution
         env:
           # prevent GitInfo errors
           CI: false
         run: ./restore.sh
+
+      # For MCP servers like nuget's
+      - name: Install .NET 10.x
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            10.x
+          dotnet-quality: preview
+
+      # for MCP servers
+      - name: Install .NET 8.x
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            8.x
+
+      # Diagnostics in the log
+      - name: dotnet --info
+        run: dotnet --info