Merge branch 'main' into marc/ocbin

# Conflicts:
#	AspNetCore.sln
#	src/Middleware/OutputCaching/OutputCaching.slnf
#	src/Middleware/OutputCaching/src/OutputCacheEntryFormatter.cs

Author: mgravell

.azure/pipelines/ci.yml

@@ -49,12 +49,6 @@ parameters:
   default: false
   displayName: Produce binlogs?
   type: boolean
-# Choose whether to test source indexing.
-# Will cause inaccessible links on https://source.dot.net/ unless commits are also available in GitHub.
-- name: testSourceIndexing
-  default: false
-  displayName: Test source indexing? !Danger! see comments in YAML.
-  type: boolean
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -71,6 +65,9 @@ variables:
     value: true
 - name: _UseHelixOpenQueues
   value: ${{ ne(variables['System.TeamProject'], 'internal') }}
+- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
+  - name: enableSourceIndex
+    value: true
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - name: _BuildArgs
     value: /p:TeamName=$(_TeamName)
@@ -85,12 +82,6 @@ variables:
     value: /p:Publish=true
            /p:GenerateChecksums=true
            /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
-  # Variables for source indexing afterBuild step and job.
-  - name: sourceIndexPackageVersion
-    value: 1.0.1-20230228.2
-  - name: sourceIndexPackageSource
-    value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
-  - group: source-dot-net stage1 variables
   - ${{ if ne(parameters.produceBinlogs, 'true') }}:
     # Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
     - name: WindowsArm64LogArgs
@@ -353,59 +344,6 @@ stages:
         - name: Windows_ANCMIISExpress_Msi
           path: artifacts/bin/AncmIISExpressV2
 
-    # Build Windows ARM
-    - template: jobs/default-build.yml
-      parameters:
-        codeSign: true
-        jobName: Windows_arm_build
-        jobDisplayName: "Build: Windows ARM"
-        agentOs: Windows
-        buildArgs:
-          -arch arm
-          -sign
-          -pack
-          -noBuildNodeJS
-          -noBuildJava
-          -binaryLog
-          /p:DotNetSignType=$(_SignType)
-          /p:OnlyPackPlatformSpecificPackages=true
-          /p:AssetManifestFileName=aspnetcore-win-arm.xml
-          $(_BuildArgs)
-          $(_PublishArgs)
-          $(_InternalRuntimeDownloadArgs)
-        ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
-          afterBuild:
-          - task: UseDotNet@2
-            displayName: Use .NET Core SDK 6
-            inputs:
-              packageType: sdk
-              version: 6.0.x
-              installationPath: $(Build.SourcesDirectory)/.dotnet
-              workingDirectory: $(Build.SourcesDirectory)
-          - powershell: . $(Build.SourcesDirectory)/activate.ps1;
-              dotnet tool install BinLogToSln
-              --version $(SourceIndexPackageVersion)
-              --add-source $(SourceIndexPackageSource)
-              --tool-path $(Build.SourcesDirectory)/.tools;
-              $(Build.SourcesDirectory)/.tools/BinLogToSln
-              -i $(Build.SourcesDirectory)/artifacts/log/Release/Build.binlog
-              -r $(Build.SourcesDirectory)
-              -n $(Build.Repository.Name)
-              -o $(Build.ArtifactStagingDirectory)/sourceIndex/
-            displayName: Process binary log into indexable sln
-        installNodeJs: false
-        installJdk: false
-        artifacts:
-        - name: Windows_arm_Logs
-          path: artifacts/log/
-          publishOnError: true
-          includeForks: true
-        - name: Windows_arm_Packages
-          path: artifacts/packages/
-        - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
-            - name: Windows_arm_SourceIndex
-              path: $(Build.ArtifactStagingDirectory)/sourceIndex/
-
     # Build MacOS arm64
     - template: jobs/default-build.yml
       parameters:
@@ -798,13 +736,26 @@ stages:
               # Log environment variables in binary logs to ease debugging
               MSBUILDLOGALLENVIRONMENTVARIABLES: true
 
+    - ${{ if eq(variables.enableSourceIndex, 'true') }}:
+      - template: /eng/common/templates/job/source-index-stage1.yml
+        parameters:
+          sourceIndexBuildCommand: ./eng/build.cmd -Configuration Release -ci -noBuildJava -binaryLog /p:OnlyPackPlatformSpecificPackages=true
+          binlogPath: artifacts/log/Release/Build.binlog
+          presteps:
+          - task: NodeTool@0
+            displayName: Install Node 18.x
+            inputs:
+              versionSpec: 18.x
+          pool:
+            name: $(DncEngInternalBuildPool)
+            demands: ImageOverride -equals 1es-windows-2022
+
     # Publish to the BAR and perform source indexing. Wait until everything else is done.
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - template: /eng/common/templates/job/publish-build-assets.yml
         parameters:
           dependsOn:
             - Windows_build
-            - Windows_arm_build
             - ${{ if ne(variables.PostBuildSign, 'true') }}:
               - CodeSign_Xplat_MacOS_arm64
               - CodeSign_Xplat_MacOS_x64
@@ -831,74 +782,15 @@ stages:
                 - MacOS_Test
                 - Linux_Test
                 - Helix_x64
+            - ${{ if eq(variables.enableSourceIndex, 'true') }}:
+              - SourceIndexStage1
             - Source_Build_Managed
           pool:
             name: $(DncEngInternalBuildPool)
             demands: ImageOverride -equals 1es-windows-2019
           publishUsingPipelines: ${{ variables._PublishUsingPipelines }}
           enablePublishBuildArtifacts: true # publish artifacts/log files
           publishAssetsImmediately: true # Don't use a separate stage for darc publishing.
-      - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
-        - job: SourceIndexUpload
-          displayName: Upload indexable solution
-          dependsOn:
-            - Windows_arm_build
-            # In addition to the dependency above that provides assets, ensure the build was successful overall.
-            - Windows_build
-            - ${{ if ne(variables.PostBuildSign, 'true') }}:
-              - CodeSign_Xplat_MacOS_arm64
-              - CodeSign_Xplat_MacOS_x64
-              - CodeSign_Xplat_Linux_x64
-              - CodeSign_Xplat_Linux_arm
-              - CodeSign_Xplat_Linux_arm64
-              - CodeSign_Xplat_Linux_musl_x64
-              - CodeSign_Xplat_Linux_musl_arm
-              - CodeSign_Xplat_Linux_musl_arm64
-            - ${{ if eq(variables.PostBuildSign, 'true') }}:
-              - MacOs_arm64_build
-              - MacOs_x64_build
-              - Linux_x64_build
-              - Linux_arm_build
-              - Linux_arm64_build
-              - Linux_musl_x64_build
-              - Linux_musl_arm_build
-              - Linux_musl_arm64_build
-            - ${{ if in(variables['Build.Reason'], 'Manual') }}:
-              - Code_check
-              - ${{ if ne(parameters.skipTests, 'true') }}:
-                - Windows_Test
-                - MacOS_Test
-                - Linux_Test
-                - Helix_x64
-            - Source_Build_Managed
-          pool:
-            name: $(DncEngInternalBuildPool)
-            # Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows
-            demands: ImageOverride -equals 1es-windows-2019
-          steps:
-            - task: DownloadBuildArtifacts@0
-              inputs:
-                artifactName: Windows_arm_SourceIndex
-                cleanDestinationFolder: true
-            # Ignore repository's global.json and any existing .NET SDK.
-            - task: UseDotNet@2
-              displayName: Use .NET Core SDK 6
-              inputs:
-                packageType: sdk
-                version: 6.0.x
-                installationPath: $(Agent.TempDirectory)/.dotnet
-                workingDirectory: $(Agent.TempDirectory)
-            - script: $(Agent.TempDirectory)/.dotnet/dotnet tool install UploadIndexStage1
-                --version $(SourceIndexPackageVersion)
-                --add-source $(SourceIndexPackageSource)
-                --tool-path $(Agent.TempDirectory)/.tools &&
-                $(Agent.TempDirectory)/.tools/UploadIndexStage1
-                -i $(System.ArtifactsDirectory)/Windows_arm_SourceIndex/
-                -n $(Build.Repository.Name)
-              displayName: Upload indexable solution
-              workingDirectory: $(Agent.TempDirectory)
-              env:
-                BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url)
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables.runCodeQL3000, 'true')) }}:
   - template: /eng/common/templates/post-build/post-build.yml

.config/CredScanSuppressions.json

@@ -38,11 +38,11 @@
       "_justification": "Legitimate UT certificate file with private key"
     },
     {
-      "file": "\\src\\DataProtection\\DataProtection\\test\\TestFiles\\TestCert1.pfx",
+      "file": "\\src\\DataProtection\\DataProtection\\test\\Microsoft.AspNetCore.DataProtection.Tests\\TestFiles\\TestCert1.pfx",
       "_justification": "Legitimate UT certificate file with private key"
     },
     {
-      "file": "\\src\\DataProtection\\DataProtection\\test\\TestFiles\\TestCert2.pfx",
+      "file": "\\src\\DataProtection\\DataProtection\\test\\Microsoft.AspNetCore.DataProtection.Tests\\TestFiles\\TestCert2.pfx",
       "_justification": "Legitimate UT certificate file with private key"
     },
     {

.github/CODEOWNERS

@@ -16,6 +16,7 @@
 /eng/common/                                                                      @dotnet-maestro-bot
 /eng/Versions.props                                                               @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
 /eng/Version.Details.xml                                                          @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
+/eng/SourceBuild*                                                                 @dotnet/source-build-internal
 /src/Caching/                                                                     @captainsafia @halter73 @mgravell
 /src/Caching/**/PublicAPI.*Shipped.txt                                            @dotnet/aspnet-api-review @captainsafia @halter73 @mgravell
 /src/Components/                                                                  @dotnet/aspnet-blazor-eng

.github/ISSUE_TEMPLATE/50_test_failure.md

@@ -46,7 +46,8 @@ Provide the stack trace associated with the test failure, if applicable.
 
 <details>
 <!--
-Provide the (helix) logs associated with the test failure, if applicable.
+If this is a Helix test failure, include the text of the .log artifact from the failing test.
+Note that you have to be signed in to Azure DevOps to see the test artifacts.
 -->
 
 ```text

.github/fabricbot.json

@@ -1548,30 +1548,6 @@
         ]
       }
     },
-    {
-      "taskType": "trigger",
-      "capabilityId": "AutoMerge",
-      "subCapability": "AutoMerge",
-      "version": "1.0",
-      "config": {
-        "taskName": "Auto Merge PRs",
-        "label": "auto-merge",
-        "minMinutesOpen": "60",
-        "mergeType": "squash",
-        "removeLabelOnPush": true,
-        "conditionalMergeTypes": [
-          {
-            "mergeType": "merge",
-            "condition": {
-              "placeholder": "labels",
-              "operator": "contains",
-              "label_name": "Type: Merge Forward :fast_forward:"
-            }
-          }
-        ],
-        "deleteBranches": true
-      }
-    },
     {
       "taskType": "trigger",
       "capabilityId": "IssueResponder",
@@ -2015,58 +1991,6 @@
         ]
       }
     },
-    {
-      "taskType": "trigger",
-      "capabilityId": "IssueResponder",
-      "subCapability": "PullRequestResponder",
-      "version": "1.0",
-      "config": {
-        "conditions": {
-          "operator": "and",
-          "operands": [
-            {
-              "name": "isAction",
-              "parameters": {
-                "action": "opened"
-              }
-            },
-            {
-              "name": "isActivitySender",
-              "parameters": {
-                "user": "dotnet-maestro-bot"
-              }
-            },
-            {
-              "name": "titleContains",
-              "parameters": {
-                "titlePattern": "Merge branch"
-              }
-            },
-            {
-              "name": "prTargetsBranch",
-              "parameters": {
-                "branchName": "main"
-              }
-            }
-          ]
-        },
-        "eventType": "pull_request",
-        "eventNames": [
-          "pull_request",
-          "issues",
-          "project_card"
-        ],
-        "taskName": "[Infrastructure PRs] Add auto-merge label to branch merge Pull Requests in main",
-        "actions": [
-          {
-            "name": "addLabel",
-            "parameters": {
-              "label": "auto-merge"
-            }
-          }
-        ]
-      }
-    },
     {
       "taskType": "scheduled",
       "capabilityId": "ScheduledSearch",
@@ -2567,7 +2491,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "8.0-preview5"
+              "milestoneName": "8.0-preview7"
             }
           }
         ],
@@ -3312,7 +3236,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "6.0.18"
+              "milestoneName": "6.0.19"
             }
           }
         ]
@@ -3356,7 +3280,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "7.0.7"
+              "milestoneName": "7.0.8"
             }
           }
         ]
@@ -3380,7 +3304,7 @@
             {
               "name": "prTargetsBranch",
               "parameters": {
-                "branchName": "release/8.0-preview4"
+                "branchName": "release/8.0-preview6"
               }
             }
           ]
@@ -3391,7 +3315,7 @@
           "issues",
           "project_card"
         ],
-        "taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview4 branch",
+        "taskName": "[Milestone Assignments] Assign Milestone to PRs merged to release/8.0-preview6 branch",
         "actions": [
           {
             "name": "removeMilestone",
@@ -3400,7 +3324,7 @@
           {
             "name": "addMilestone",
             "parameters": {
-              "milestoneName": "8.0-preview4"
+              "milestoneName": "8.0-preview6"
             }
           }
         ]