merge main

Author: DeagleGross

.azure/pipelines/ci-public.yml

@@ -570,11 +570,13 @@ stages:
         # Build the shared framework
         - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                  /p:VsTestUseMSBuildOutput=false
           displayName: Build shared fx
         # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
         - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
                   -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                  /p:VsTestUseMSBuildOutput=false
           displayName: Run build.cmd helix target
           env:
             HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/jobs/default-build.yml

@@ -66,7 +66,6 @@ parameters:
 
   configuration: 'Release'
   container: ''
-  enableRichCodeNavigation: ''
   installNodeJs: true
   timeoutInMinutes: 180
   testRunTitle: $(AgentOsName)-$(BuildConfiguration)
@@ -86,9 +85,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       ${{ if ne(parameters.condition, '') }}:
         condition: ${{ parameters.condition }}
-      ${{ if ne(parameters.enableRichCodeNavigation, '') }}:
-        enableRichCodeNavigation: true
-        richCodeNavigationLanguage: 'csharp,typescript,java'
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
       ${{ if and(eq(parameters.isAzDOTestingJob, true), ne(parameters.enablePublishTestResults, false)) }}:
@@ -109,10 +105,10 @@ jobs:
           vmImage: macOS-13
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           ${{ if eq(parameters.useHostedUbuntu, true) }}:
-            vmImage: ubuntu-20.04
+            vmImage: ubuntu-22.04
           ${{ else }}:
             name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
+            demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngPublicBuildPool)
           demands: ImageOverride -equals windows.vs2022preview.amd64.open
@@ -166,8 +162,6 @@ jobs:
       - ${{ if eq(parameters.agentOs, 'macOS') }}:
         - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
           displayName: Use XCode 15.2.0
-      - checkout: self
-        clean: true
       - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
         - powershell: ./eng/scripts/InstallProcDump.ps1
           displayName: Install ProcDump
@@ -298,9 +292,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       ${{ if ne(parameters.condition, '') }}:
         condition: ${{ parameters.condition }}
-      ${{ if ne(parameters.enableRichCodeNavigation, '') }}:
-        enableRichCodeNavigation: true
-        richCodeNavigationLanguage: 'csharp,typescript,java'
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
       ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
@@ -327,7 +318,7 @@ jobs:
           os: macOS
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           name: $(DncEngInternalBuildPool)
-          image: 1es-ubuntu-2004
+          image: 1es-ubuntu-2204
           os: linux
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngInternalBuildPool)
@@ -393,8 +384,6 @@ jobs:
       - ${{ if eq(parameters.agentOs, 'macOS') }}:
         - script: sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer
           displayName: Use XCode 15.2.0
-      - checkout: self
-        clean: true
       - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
         - powershell: ./eng/scripts/InstallProcDump.ps1
           displayName: Install ProcDump

.azure/pipelines/richnav.yml

@@ -8,5 +8,6 @@
   ],
   "projectName": "DEVDIV",
   "repositoryName": "AspNetCore",
-  "template": "TFSDEVDIV"
+  "template": "TFSDEVDIV",
+  "serviceTreeId": "4db45fa9-fb0f-43ce-b523-ad1da773dfbc"
 }

.config/tsaoptions.json

@@ -18,6 +18,7 @@
     "dbaeumer.vscode-eslint"
   ],
   "settings": {
+    "dotnet.defaultSolution": "AspNetCore.slnx",
     // Loading projects on demand is better for larger codebases
     "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
     "omnisharp.enableRoslynAnalyzers": true,

.devcontainer/devcontainer.json

@@ -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-preview3
+          milestone: 10.0-preview4
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview2
+          branch: release/10.0-preview3
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview2
+          milestone: 10.0-preview3
       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.5
       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.16
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues

.github/policies/resourceManagement.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@main
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@0c0caeb605f7b2b99408bfa6b18b13526d747727 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

.github/workflows/backport.yml

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@0c0caeb605f7b2b99408bfa6b18b13526d747727 # 2024-06-24

.github/workflows/inter-branch-merge-flow.yml

@@ -1,7 +1,7 @@
 name: Locker - Lock stale issues
 on:
   schedule:
-    - cron: '34 8 * * *' # Once per day, overnight PT, uncommon minute of hour
+    - cron: '34 12 * * 1-5' # Once per weekday, overnight PT, uncommon minute of hour
 
   workflow_dispatch:
     # Manual triggering through the GitHub UI, API, or CLI
@@ -23,7 +23,7 @@ jobs:
     if: ${{ github.repository_owner == 'dotnet' }}
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: "microsoft/vscode-github-triage-actions"
           path: ./actions

.github/workflows/locker.yml

@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Use Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
       with:
         node-version: 16.x
     - name: Run Markdownlint