Merge branch 'main' into wtgodbe/InstallerWorkaround

Author: wtgodbe

.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
@@ -568,11 +570,11 @@ stages:
           publishOnError: true
           includeForks: true
 
-    # Helix x64
+    # Helix x64 subset 1
     - template: jobs/default-build.yml
       parameters:
-        jobName: Helix_x64
-        jobDisplayName: 'Tests: Helix x64'
+        jobName: Helix_x64_Subset_1
+        jobDisplayName: 'Tests: Helix x64 Subset 1'
         agentOs: Windows
         timeoutInMinutes: 240
         steps:
@@ -585,14 +587,43 @@ stages:
         - 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:RunTemplateTests=false
+                  /p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=1
           displayName: Run build.cmd helix target
           env:
             HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
             SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
         artifacts:
-        - name: Helix_Logs_Attempt_$(System.JobAttempt)
+        - name: Helix_Subset_1_Logs_Attempt_$(System.JobAttempt)
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
+
+    # Helix x64 subset 2
+    - template: jobs/default-build.yml
+      parameters:
+        jobName: Helix_x64_Subset_2
+        jobDisplayName: 'Tests: Helix x64 Subset 2'
+        agentOs: Windows
+        timeoutInMinutes: 240
+        steps:
+        # 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 -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:RunTemplateTests=false /p:HelixSubset=2
+          displayName: Run build.cmd helix target
+          env:
+            HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+            SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+
+        artifacts:
+        - name: Helix_Subset_2_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true

.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
@@ -622,8 +624,8 @@ extends:
         # Helix x64
         - template: .azure/pipelines/jobs/default-build.yml@self
           parameters:
-            jobName: Helix_x64
-            jobDisplayName: 'Tests: Helix x64'
+            jobName: Helix_x64_Subset_1
+            jobDisplayName: 'Tests: Helix x64 Subset 1'
             agentOs: Windows
             timeoutInMinutes: 240
             steps:
@@ -635,15 +637,44 @@ extends:
               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
+                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=1
                       /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
                 SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
             artifacts:
-            - name: Helix_Logs_Attempt_$(System.JobAttempt)
+            - name: Helix_Logs_Subset_1_Attempt_$(System.JobAttempt)
+              path: artifacts/log/
+              publishOnError: true
+              includeForks: true
+
+        # Helix x64
+        - template: .azure/pipelines/jobs/default-build.yml@self
+          parameters:
+            jobName: Helix_x64_Subset_2
+            jobDisplayName: 'Tests: Helix x64 Subset 2'
+            agentOs: Windows
+            timeoutInMinutes: 240
+            steps:
+            # 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)
+              env:
+                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 -all -noBuildRepoTasks -noBuildNative -noBuild -test
+                      -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=2
+                      /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
+                SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+
+            artifacts:
+            - name: Helix_Logs_Subset_2_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
@@ -745,7 +776,8 @@ extends:
                   - Windows_Test
                   - MacOS_Test
                   - Linux_Test
-                  - Helix_x64
+                  - Helix_x64_Subset_1
+                  - Helix_x64_Subset_2
               - ${{ if eq(variables.enableSourceIndex, 'true') }}:
                 - SourceIndexStage1
               - Source_Build_Managed

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

@@ -18,14 +18,24 @@ pr:
     include:
     - '*'
   paths:
+    include:
+    - eng/*
+    - src/Components/*
+    - src/Extensions/*
+    - src/Framework/*
+    - src/Hosting/*
+    - src/Http/*
+    - src/Middleware/HttpLogging/*
+    - src/Middleware/HttpOverrides/*
+    - src/Middleware/HttpsPolicy/*
+    - src/Middleware/Localization/*
+    - src/Middleware/Session/*
+    - src/Middleware/StaticFiles/*
+    - src/Middleware/WebSockets/*
+    - src/Servers/*
+    - src/SignalR/*
     exclude:
-    - .devcontainer/*
-    - .github/*
-    - .vscode/*
-    - docs/*
     - '**/*.md'
-    - LICENSE.TXT
-    - THIRD-PARTY-NOTICES.TXT
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE

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

@@ -17,6 +17,8 @@ pr:
   paths:
     include:
     - src/ProjectTemplates/*
+    - src/Components/*
+    - src/Mvc/*
 
 variables:
 - name: _UseHelixOpenQueues
@@ -45,6 +47,8 @@ jobs:
               /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/

.editorconfig

@@ -464,12 +464,6 @@ dotnet_diagnostic.IDE0161.severity = silent
 # IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included.
 dotnet_diagnostic.IDE0005.severity = silent
 
-[{**/microsoft.dotnet.hotreload.agent*/**.cs}]
-# IDE0005: Remove unused usings. Ignore for shared src files coming from nuget package.
-dotnet_diagnostic.IDE0005.severity = silent
-# IDE0073: A source file is missing a required header. Ignore for shared src files coming from nuget package.
-dotnet_diagnostic.IDE0073.severity = silent
-
 
 # Verify settings
 [*.{received,verified}.{txt,xml,json}]

.github/copilot-instructions.md

@@ -32,3 +32,11 @@
 ## Running tests
 
 * To build and run tests in the repo, use the `build.sh` script that is located in each subdirectory within the `src` folder. For example, to run the build with tests in the `src/Http` directory, run `./src/Http/build.sh -test`.
+
+## .NET Environment
+
+* Before running any `dotnet` commands in this repository, always activate the locally installed .NET environment first by running the appropriate activation script from the repository root:
+  * On Windows: `. ./activate.ps1` (from repository root)
+  * On Linux/Mac: `source activate.sh` (from repository root)
+* If not in the repository root, navigate there first or use the full path to the activation script.
+* This ensures that the correct version of .NET SDK is used for the repository.

.github/policies/resourceManagement.yml

@@ -441,18 +441,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview7
+          milestone: 10.0-rc1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview6
+          branch: release/10.0-preview7
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview6
+          milestone: 10.0-preview7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues