Merge branch 'dotnet:main' into fix-producesresponsetype-minimal-api-again

Author: sander1095

.azure/pipelines/ci-public.yml

@@ -47,6 +47,8 @@ parameters:
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
 - name: _TeamName
   value:  AspNetCore
 - name: _PublishUsingPipelines
@@ -582,10 +584,10 @@ stages:
                   /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
+        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -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
+                  /p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false
           displayName: Run build.cmd helix target
           env:
             HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/ci.yml

@@ -31,6 +31,8 @@ parameters:
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
 - name: _TeamName
   value:  AspNetCore
 - name: _PublishUsingPipelines
@@ -634,9 +636,9 @@ extends:
                 MSBUILDUSESERVER: "1"
               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
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -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:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
               displayName: Run build.cmd helix target
               env:
                 HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

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

@@ -58,11 +58,35 @@ jobs:
       displayName: Build JS
     - script: .dotnet/dotnet build ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-restore
       displayName: Build
-    - script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined!=true|Quarantined=false'
-                 -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)/Unquarantined
+    - script: |
+        set -eo pipefail
+
+        .dotnet/dotnet test ./src/Components/test/E2ETest \
+          -c $(BuildConfiguration) \
+          --no-build \
+          --filter 'Quarantined!=true|Quarantined=false' \
+          -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)/Unquarantined \
+          | tee e2e-test-output.log
+
+        if grep -q "No test matches the given testcase filter" e2e-test-output.log
+        then
+          echo "##vso[task.logissue type=error] No tests matched the filter."
+
+          exit 1
+        fi
+
+        # Check total tests run to detect abnormalities. In case the number of tests changes significantly, we should adjust the threshold.
+        # Extract total from the summary line "Failed: xx, Passed: yy, Skipped: zz, Total: NNN, Duration: ..."
+        total=$(sed -nE 's/.*Failed:[[:space:]]*[0-9]+,[[:space:]]*Passed:[[:space:]]*[0-9]+,[[:space:]]*Skipped:[[:space:]]*[0-9]+,[[:space:]]*Total:[[:space:]]*([0-9]+).*/\1/p' e2e-test-output.log)
+        min_total=1000
+        if [ -z "$total" ] || [ "$total" -lt "$min_total" ]
+        then
+          echo "##vso[task.logissue type=error] Insufficient total test count: $total. We expect at least $min_total tests to run."
+          exit 1
+        fi
       displayName: Run E2E tests
     - script: .dotnet/dotnet test ./src/Components/test/E2ETest -c $(BuildConfiguration) --no-build --filter 'Quarantined=true' -p:RunQuarantinedTests=true
                  -p:VsTestUseMSBuildOutput=false

.azure/pipelines/identitymodel-helix-matrix.yml

@@ -37,6 +37,8 @@ extends:
         compiled:
           enabled: false
           justificationForDisabling: 'This is a test-only pipeline. The same product code is already scanned in the main pipeline (aspnetcore-ci)'
+    featureFlags:
+      autoEnablePREfastWithNewRuleset: false
 
     stages:
     - stage: build

.azure/pipelines/report-green.yml

@@ -0,0 +1,37 @@
+# This CI job only runs on PRs where all other jobs are skipped.
+# This allows Build Analysis to report green. Without this, no jobs would run,
+# causing Build Analysis to hang indefinitely (or until someone commented "ba-g {justification}" on the PR).
+
+# Only run this on PRs
+trigger: none
+# Run for all branches, only on paths that no-op other jobs
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - '*'
+  paths:
+    include:
+    - .devcontainer/*
+    - .github/*
+    - .vscode/*
+    - docs/*
+    - '**/*.md'
+    - LICENSE.TXT
+    - THIRD-PARTY-NOTICES.TXT
+
+# ABG - Always Be Green
+jobs:
+- template: /eng/common/templates/jobs/jobs.yml
+  parameters:
+    enableTelemetry: true
+    helixRepo: dotnet/aspnetcore
+    jobs:
+    - job: Report_Green
+      enableSBOM: false
+      pool:
+        vmImage: ubuntu-22.04
+      steps:
+      - powershell: |
+          exit 0
+        displayName: Exit 0

.azure/pipelines/template-tests-pr.yml

@@ -0,0 +1,55 @@
+# Configure which branches trigger builds
+# We want to run template tests on release/8.0 and later as well as on certain PRs
+trigger:
+  batch: true
+  branches:
+    include:
+    - main
+    - release/*
+
+# Run PR validation on branches that include Helix tests
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    include:
+    - src/ProjectTemplates/*
+    - src/Components/*
+    - src/Mvc/*
+
+variables:
+- name: _UseHelixOpenQueues
+  value: ${{ ne(variables['System.TeamProject'], 'internal') }}
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - group: DotNet-HelixApi-Access
+- template: /eng/common/templates/variables/pool-providers.yml
+
+jobs:
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Helix_templates_x64
+    jobDisplayName: 'Tests: Helix template tests x64'
+    agentOs: Windows
+    timeoutInMinutes: 180
+    steps:
+    - script: git submodule update --init
+      displayName: Update submodules
+    # 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 /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 -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
+              /p:VsTestUseMSBuildOutput=false /p:OnlyTestProjectTemplates=true
+      displayName: Run build.cmd helix target
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+    artifacts:
+    - name: Helix_logs
+      path: artifacts/log/
+      publishOnError: true

.github/policies/resourceManagement.yml

@@ -168,6 +168,45 @@ configuration:
             To make sure no conflicting changes have occurred, please rerun validation before merging. You can do this by leaving an `/azp run` comment here (requires commit rights), or by simply closing and reopening.
       - addLabel:
           label: pending-ci-rerun
+    - description: '[Idle Issue Management] Tag aspnet-build on dependency PRs (non-weekend)'
+      frequencies:
+      - weekday:
+          day: Tuesday
+          time: 0:0
+      - weekday:
+          day: Wednesday
+          time: 0:0
+      - weekday:
+          day: Thursday
+          time: 0:0
+      - weekday:
+          day: Friday
+          time: 0:0
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: 'build-ops'
+      - noActivitySince:
+          days: 1
+      actions:
+      - addReply:
+          reply: This dependency PR has had no activity for a full business day - @dotnet/aspnet-build please take a look if you are on build-ops.
+    - description: '[Idle Issue Management] Tag aspnet-build on dependency PRs (weekend)'
+      frequencies:
+      - weekday:
+          day: Monday
+          time: 0:0
+      filters:
+      - isPullRequest
+      - isOpen
+      - hasLabel:
+          label: 'build-ops'
+      - noActivitySince:
+          days: 3
+      actions:
+      - addReply:
+          reply: This dependency PR has had no activity for a full business day - @dotnet/aspnet-build please take a look if you are on build-ops.
     eventResponderTasks:
     - if:
       - payloadType: Issue_Comment
@@ -247,6 +286,26 @@ configuration:
       - approvePullRequest:
           comment: Auto-approving dependency update.
       description: '[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: dotnet-maestro[bot]
+          issueAuthor: False
+      - targetsBranch:
+          branch: main
+      - or:
+        - titleContains:
+            pattern: Update dependencies
+            isRegex: False
+        - titleContains:
+            pattern: Source code updates
+            isRegex: False
+      then:
+      - addLabel:
+          label: 'build-ops'
+      description: '[Infrastructure PRs] Add build-ops label to dependency update Pull Requests against main'
     - if:
       - payloadType: Pull_Request
       - isAction:
@@ -264,6 +323,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Merge Forward :fast_forward:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving branch merge.
       description: '[Infrastructure PRs] Add area-infrastructure label to auto-merge Pull Requests'
@@ -380,18 +441,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview6
+          milestone: 10.0-preview7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview5
+          branch: release/10.0-preview6
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview5
+          milestone: 10.0-preview6
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues
@@ -495,16 +556,16 @@ configuration:
       - isAction:
           action: Opened
       - targetsBranch:
-          branch: release/2.1
+          branch: release/2.3
       then:
       - addMilestone:
-          milestone: 2.1.x
+          milestone: 2.3.x
       - addReply:
           reply: >-
             Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
 
             Otherwise, please add `tell-mode` label.
-      description: Add release/2.1 targeting PRs to the servicing project
+      description: Add release/2.3 targeting PRs to the servicing project
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -553,7 +614,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0.6
+          milestone: 9.0.7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -564,7 +625,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.17
+          milestone: 8.0.18
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues
@@ -651,6 +712,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Dependency Update :arrow_up_small:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving SDK update.
       - enableAutoMerge:
@@ -670,6 +733,8 @@ configuration:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Dependency Update :arrow_up_small:'
+      - addLabel:
+          label: 'build-ops'
       - approvePullRequest:
           comment: Auto-approving dependabot update.
       - enableAutoMerge:

.github/workflows/backport.yml

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

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

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@fdcda9b4919dd16bd2388b5421cc5d55afac0e88 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@aea743edf7c9345cfdbdf9593756973baadc6b37 # 2024-06-24

.gitignore

@@ -3,6 +3,7 @@ artifacts/
 bin/
 obj/
 .dotnet/
+.gradle/
 .nuget/
 .packages/
 .tools/
@@ -13,6 +14,7 @@ BenchmarkDotNet.Artifacts/
 src/SignalR/clients/**/dist/
 modules/
 .ionide/
+TestResults/
 
 # File extensions
 *.aps
@@ -33,9 +35,11 @@ modules/
 *.suo
 *.svclog
 *.tlog
+*.trx
 *.user
 *.userprefs
 *.vspx
+*.json.bak
 
 # Specific files, typically generated by tools
 .config/dotnet-tools.json