Merge branch 'main' into blazor_metrics_feedback

Author: pavelsavara

.azure/pipelines/ci-public.yml

@@ -19,6 +19,15 @@ pr:
   branches:
     include:
     - '*'
+  paths:
+    exclude:
+    - .devcontainer/*
+    - .github/*
+    - .vscode/*
+    - docs/*
+    - '**/*.md'
+    - LICENSE.TXT
+    - THIRD-PARTY-NOTICES.TXT
 
 parameters:
 # Choose whether to skip tests when running pipeline manually.
@@ -632,8 +641,8 @@ stages:
       platform:
         name: 'Managed'
         container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
-        buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-        skipPublishValidation: true
+        buildScript: './eng/build.sh'
+        buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
         jobProperties:
           timeoutInMinutes: 120
           variables:

.azure/pipelines/ci.yml

@@ -173,6 +173,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(Windows64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build x64
 
           # Build the x86 shared framework
@@ -190,6 +192,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(Windows86LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build x86
 
           # Build the arm64 shared framework
@@ -207,6 +211,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsArm64LogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build ARM64
 
           - script: .\src\SiteExtensions\build.cmd
@@ -218,6 +224,8 @@ extends:
                     -noBuildNative
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build SiteExtension
 
           # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
@@ -233,6 +241,8 @@ extends:
                     /p:DotNetSignType=$(_SignType)
                     $(_BuildArgs)
                     $(WindowsSignLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Code sign packages
 
           # Windows installers bundle x86/x64/arm64 assets
@@ -247,6 +257,8 @@ extends:
                     $(_BuildArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsInstallersLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build Installers
 
           # Windows installers bundle and sharedfx msi for arm64
@@ -265,6 +277,8 @@ extends:
                     $(_PublishArgs)
                     $(_InternalRuntimeDownloadArgs)
                     $(WindowsArm64InstallersLogArgs)
+            env:
+              MSBUILDUSESERVER: "1"
             displayName: Build ARM64 Installers
 
           artifacts:
@@ -534,32 +548,33 @@ extends:
           parameters:
             inputName: Linux_musl_arm64
 
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          jobName: Windows_Test
+          jobDisplayName: "Test: Windows Server x64"
+          agentOs: Windows
+          isAzDOTestingJob: true
+          continueOnError: true
+          # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
+          cancelTimeoutInMinutes: 30
+          buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
+                     /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
+                     $(_InternalRuntimeDownloadArgs)
+          beforeBuild:
+          - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
+            displayName: Setup IISExpress test certificates and schema
+          artifacts:
+          - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
+            path: artifacts/log/
+            publishOnError: true
+            includeForks: true
+          - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
+            path: artifacts/TestResults/
+            publishOnError: true
+            includeForks: true
+
       - ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
         # Test jobs
-        - template: .azure/pipelines/jobs/default-build.yml@self
-          parameters:
-            jobName: Windows_Test
-            jobDisplayName: "Test: Windows Server x64"
-            agentOs: Windows
-            isAzDOTestingJob: true
-            # Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
-            cancelTimeoutInMinutes: 30
-            buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
-                       /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:RunBlazorPlaywrightTemplateTests=true
-                       $(_InternalRuntimeDownloadArgs)
-            beforeBuild:
-            - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
-              displayName: Setup IISExpress test certificates and schema
-            artifacts:
-            - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
-              path: artifacts/log/
-              publishOnError: true
-              includeForks: true
-            - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
-              path: artifacts/TestResults/
-              publishOnError: true
-              includeForks: true
-
         - template: .azure/pipelines/jobs/default-build.yml@self
           parameters:
             jobName: MacOS_Test
@@ -615,6 +630,8 @@ extends:
             # 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 -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
@@ -668,16 +685,15 @@ extends:
                 path: artifacts/log/
                 publishOnError: true
                 includeForks: true
-
       # Source build
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:
           enableInternalSources: true
           platform:
             name: 'Managed'
-            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
-            buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
-            skipPublishValidation: true
+            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
+            buildScript: './eng/build.sh'
+            buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
             jobProperties:
               timeoutInMinutes: 120
               variables:

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

@@ -62,6 +62,7 @@ parameters:
   isAzDOTestingJob: false
   enablePublishTestResults: ''
   enableSbom: true
+  continueOnError: false
   variables: []
 
   configuration: 'Release'
@@ -128,6 +129,8 @@ jobs:
       - TeamName: AspNetCore
       - ${{ if ne(parameters.codeSign, true) }}:
         - _SignType: ''
+      - ${{ if ne(parameters.isAzDOTestingJob, true) }}:
+        - MSBUILDUSESERVER: "1"
       - LC_ALL: 'en_US.UTF-8'
       - LANG: 'en_US.UTF-8'
       - LANGUAGE: 'en_US.UTF-8'
@@ -207,13 +210,15 @@ jobs:
           - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
               /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
               DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
           - script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
@@ -345,6 +350,8 @@ jobs:
         - LANGUAGE: 'en_US.UTF-8'
       - ${{ if ne(parameters.codeSign, true) }}:
         - _SignType: ''
+      - ${{ if ne(parameters.isAzDOTestingJob, true) }}:
+        - MSBUILDUSESERVER: "1"
       - ${{ else }}:
         - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
           - _SignType: real
@@ -443,13 +450,15 @@ jobs:
           - script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
               /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
               DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
           - script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
+            continueOnError: ${{ parameters.continueOnError }}
             env:
               COMPlus_DbgEnableMiniDump: 1
               COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"

.editorconfig

@@ -464,6 +464,13 @@ 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}]
 charset = "utf-8-bom"

.github/CODEOWNERS

@@ -14,7 +14,6 @@
 /eng/                                                                             @dotnet/aspnet-build @wtgodbe
 /eng/Versions.props                                                               @dotnet/aspnet-build @wtgodbe
 /eng/Version.Details.xml                                                          @dotnet/aspnet-build @wtgodbe
-/eng/SourceBuild*                                                                 @dotnet/source-build
 /src/Caching/                                                                     @captainsafia @halter73 @mgravell
 /src/Components/                                                                  @dotnet/aspnet-blazor-eng
 /src/DefaultBuilder/                                                              @halter73

.github/policies/resourceManagement.yml

@@ -232,9 +232,13 @@ configuration:
       - isActivitySender:
           user: dotnet-maestro[bot]
           issueAuthor: False
-      - titleContains:
-          pattern: Update dependencies
-          isRegex: False
+      - or:
+        - titleContains:
+            pattern: Update dependencies
+            isRegex: False
+        - titleContains:
+            pattern: Source code updates
+            isRegex: False
       - targetsBranch:
           branch: main
       then:
@@ -551,7 +555,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0.5
+          milestone: 9.0.6
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -562,7 +566,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.16
+          milestone: 8.0.17
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues
@@ -642,13 +646,36 @@ configuration:
       - titleContains:
           pattern: Update .NET SDK
           isRegex: False
+      - targetsBranch:
+          branch: main
       then:
       - addLabel:
           label: area-infrastructure
       - addLabel:
           label: 'Type: Dependency Update :arrow_up_small:'
       - approvePullRequest:
           comment: Auto-approving SDK update.
-      description: '[Infrastructure PRs] Add area-infrastructure label to SDK update Pull Requests'
+      - enableAutoMerge:
+          mergeMethod: "squash"
+      description: '[Infrastructure PRs] Add area-infrastructure label to SDK update Pull Requests & enable auto-merge'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - isActivitySender:
+          user: dependabot[bot]
+          issueAuthor: False
+      - targetsBranch:
+          branch: main
+      then:
+      - addLabel:
+          label: area-infrastructure
+      - addLabel:
+          label: 'Type: Dependency Update :arrow_up_small:'
+      - approvePullRequest:
+          comment: Auto-approving dependabot update.
+      - enableAutoMerge:
+          mergeMethod: "squash"
+      description: '[Infrastructure PRs] Add area-infrastructure label to dependabot update Pull Requests & enable auto-merge'
 onFailure: 
 onSuccess: 

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@e80f44b15b3050d868dc8fb58d0fa514ca8c7451 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@d7540e540636883d3d080d087223d28b6b7395ae # 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@e80f44b15b3050d868dc8fb58d0fa514ca8c7451 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@d7540e540636883d3d080d087223d28b6b7395ae # 2024-06-24

.github/workflows/labeler-cache-retention.yml

@@ -0,0 +1,40 @@
+# Workflow template imported and updated from:
+# https://github.com/dotnet/issue-labeler/wiki/Onboarding
+#
+# See labeler.md for more information
+#
+# Regularly restore the prediction models from cache to prevent cache eviction
+name: "Labeler: Cache Retention"
+
+# For more information about GitHub's action cache limits and eviction policy, see:
+# https://docs.github.com/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
+
+on:
+  schedule:
+    - cron: "32 16 * * *" # 16:32 every day (arbitrary time daily)
+
+  workflow_dispatch:
+    inputs:
+      cache_key:
+        description: "The cache key suffix to use for restoring the model from cache. Defaults to 'ACTIVE'."
+        required: true
+        default: "ACTIVE"
+
+env:
+  CACHE_KEY: ${{ inputs.cache_key || 'ACTIVE' }}
+
+jobs:
+  restore-cache:
+    # Do not automatically run the workflow on forks outside the 'dotnet' org
+    if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        type: ["issues", "pulls"]
+    steps:
+      - uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
+        with:
+          type: ${{ matrix.type }}
+          cache_key: ${{ env.CACHE_KEY }}
+          fail-on-cache-miss: true