Merging main into darc-main-3819c250-0f95-492c-8991-e88710ccf8da

Author: dotnet-maestro[bot]

.azure/pipelines/ci.yml

@@ -534,32 +534,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

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

@@ -62,6 +62,7 @@ parameters:
   isAzDOTestingJob: false
   enablePublishTestResults: ''
   enableSbom: true
+  continueOnError: false
   variables: []
 
   configuration: 'Release'
@@ -207,13 +208,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"
@@ -443,13 +446,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"

.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:

.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@76dd1b4eb3b15881da350de93805ea6ab936364c # 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@76dd1b4eb3b15881da350de93805ea6ab936364c # 2024-06-24

.github/workflows/markdownlint.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Use Node.js
-      uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+      uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
       with:
         node-version: 16.x
     - name: Run Markdownlint

.github/workflows/update-jquery-validate.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: '20.x'
 

.github/workflows/validate-npm-package-lock-json.yml

@@ -20,7 +20,7 @@ jobs:
           submodules: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: 20.x
 

Directory.Build.targets

@@ -119,7 +119,7 @@
     <IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
 
     <BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND $(IsTestProject) ">true</BuildHelixPayload>
-    <SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
+    <SkipTests Condition="'$(SkipTests)' == '' AND '$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
   </PropertyGroup>
 
   <PropertyGroup>

eng/Dependencies.props

@@ -70,7 +70,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
     <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
     <LatestPackageReference Include="Microsoft.OpenApi" />
-    <LatestPackageReference Include="Microsoft.OpenApi.Readers" />
+    <LatestPackageReference Include="Microsoft.OpenApi.YamlReader" />
     <LatestPackageReference Include="System.Buffers" />
     <LatestPackageReference Include="System.CodeDom" />
     <LatestPackageReference Include="System.CommandLine.Experimental" />