Merge branch 'main' into fix/56331

Author: joegoldman2

.azure/pipelines/azure-pipelines-mirror-within-azdo.yml

@@ -3,7 +3,7 @@ trigger:
   batch: true
   branches:
     include:
-    - internal/release/6.0
+    - internal/release/8.0
 
 parameters:
 # Run the pipeline manually (usually disallowed)

.azure/pipelines/ci-public.yml

@@ -101,7 +101,7 @@ stages:
       - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
         displayName: Run eng/scripts/CodeCheck.ps1
       artifacts:
-      - name: Code_Check_Logs
+      - name: Code_Check_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -227,7 +227,7 @@ stages:
         displayName: Build ARM64 Installers
 
       artifacts:
-      - name: Windows_Logs
+      - name: Windows_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -259,7 +259,7 @@ stages:
         $(_PublishArgs)
         $(_InternalRuntimeDownloadArgs)
       artifacts:
-      - name: MacOS_arm64_Logs
+      - name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -289,7 +289,7 @@ stages:
         $(_PublishArgs)
         $(_InternalRuntimeDownloadArgs)
       artifacts:
-      - name: MacOS_x64_Logs
+      - name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -351,7 +351,7 @@ stages:
         displayName: Build RPM installers
         target: rpmpkg
       artifacts:
-      - name: Linux_x64_Logs
+      - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -381,7 +381,7 @@ stages:
         $(_PublishArgs)
         $(_InternalRuntimeDownloadArgs)
       artifacts:
-      - name: Linux_arm_Logs
+      - name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -428,7 +428,7 @@ stages:
         displayName: Build RPM installers
         target: rpmpkg
       artifacts:
-      - name: Linux_arm64_Logs
+      - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -459,10 +459,9 @@ stages:
         $(_BuildArgs)
         $(_PublishArgs)
         $(_InternalRuntimeDownloadArgs)
-      installNodeJs: false
       disableComponentGovernance: true
       artifacts:
-      - name: Linux_musl_x64_Logs
+      - name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -495,7 +494,7 @@ stages:
         $(_PublishArgs)
         $(_InternalRuntimeDownloadArgs)
       artifacts:
-      - name: Linux_musl_arm_Logs
+      - name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -528,7 +527,7 @@ stages:
         $(_PublishArgs)
         $(_InternalRuntimeDownloadArgs)
       artifacts:
-      - name: Linux_musl_arm64_Logs
+      - name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -557,14 +556,18 @@ stages:
         - 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
+        - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
-        - name: Windows_Test_Results
+        - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
           path: artifacts/TestResults/
           publishOnError: true
           includeForks: true
+        - name: Minified_JS_Files
+          path: src/Components/Web.JS/dist/Release/
+          publishOnError: true
+          includeForks: true
 
     - template: jobs/default-build.yml
       parameters:
@@ -578,11 +581,11 @@ stages:
         - bash: "./eng/scripts/install-nginx-mac.sh"
           displayName: Installing Nginx
         artifacts:
-        - name: MacOS_Test_Logs
+        - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
-        - name: MacOS_Test_Results
+        - name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
           path: artifacts/TestResults/
           publishOnError: true
           includeForks: true
@@ -601,11 +604,11 @@ stages:
         - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
           displayName: Increase inotify limit
         artifacts:
-        - name: Linux_Test_Logs
+        - name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
-        - name: Linux_Test_Results
+        - name: Linux_Test_Results_Attempt_$(System.JobAttempt)
           path: artifacts/TestResults/
           publishOnError: true
           includeForks: true
@@ -632,7 +635,39 @@ stages:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
         artifacts:
-        - name: Helix_logs
+        - name: Helix_Logs_Attempt_$(System.JobAttempt)
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
+
+    # Local development validation
+    - template: jobs/default-build.yml
+      parameters:
+        jobName: Local_Windows
+        jobDisplayName: 'Test: Windows local development validation'
+        agentOs: Windows
+        timeoutInMinutes: 240
+        steps:
+        - script: git submodule update --init
+          displayName: Update submodules
+        - script: ./restore.cmd
+          displayName: Run restore.cmd
+        - script: npm run build
+          displayName: Build JS
+        - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+          displayName: Build (Debug)
+        - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+          displayName: Build (Release)
+        - script: ./src/ProjectTemplates/build.cmd
+                  -test
+                  -NoRestore
+                  -NoBuild
+                  -NoBuildDeps
+                  -configuration Release
+          displayName: Run project template tests
+
+        artifacts:
+        - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true

.azure/pipelines/ci.yml

@@ -96,7 +96,6 @@ variables:
     value: /bl:artifacts/log/Release/Build.Installers.binlog
   - name: WindowsArm64InstallersLogArgs
     value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
-- group: DotNetBuilds storage account read tokens
 - name: _InternalRuntimeDownloadArgs
   value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -145,6 +144,10 @@ extends:
         os: windows
       spotBugs:
         enabled: false
+      policheck:
+        enabled: true
+      tsa:
+        enabled: true
     containers:
       alpine319WithNode:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
@@ -167,7 +170,7 @@ extends:
             - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
               displayName: Run eng/scripts/CodeCheck.ps1
             artifacts:
-            - name: Code_Check_Logs
+            - name: Code_Check_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
@@ -293,7 +296,7 @@ extends:
             displayName: Build ARM64 Installers
 
           artifacts:
-          - name: Windows_Logs
+          - name: Windows_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -325,7 +328,7 @@ extends:
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           artifacts:
-          - name: MacOS_arm64_Logs
+          - name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -355,7 +358,7 @@ extends:
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           artifacts:
-          - name: MacOS_x64_Logs
+          - name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -417,7 +420,7 @@ extends:
             displayName: Build RPM installers
             target: rpmpkg
           artifacts:
-          - name: Linux_x64_Logs
+          - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -447,7 +450,7 @@ extends:
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           artifacts:
-          - name: Linux_arm_Logs
+          - name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -494,7 +497,7 @@ extends:
             displayName: Build RPM installers
             target: rpmpkg
           artifacts:
-          - name: Linux_arm64_Logs
+          - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -525,10 +528,9 @@ extends:
             $(_BuildArgs)
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
-          installNodeJs: false
           disableComponentGovernance: true
           artifacts:
-          - name: Linux_musl_x64_Logs
+          - name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -561,7 +563,7 @@ extends:
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           artifacts:
-          - name: Linux_musl_arm_Logs
+          - name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -594,7 +596,7 @@ extends:
             $(_PublishArgs)
             $(_InternalRuntimeDownloadArgs)
           artifacts:
-          - name: Linux_musl_arm64_Logs
+          - name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -623,11 +625,11 @@ extends:
             - 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
+            - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
-            - name: Windows_Test_Results
+            - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
               path: artifacts/TestResults/
               publishOnError: true
               includeForks: true
@@ -644,11 +646,11 @@ extends:
             - bash: "./eng/scripts/install-nginx-mac.sh"
               displayName: Installing Nginx
             artifacts:
-            - name: MacOS_Test_Logs
+            - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
-            - name: MacOS_Test_Results
+            - name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
               path: artifacts/TestResults/
               publishOnError: true
               includeForks: true
@@ -667,11 +669,11 @@ extends:
             - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
               displayName: Increase inotify limit
             artifacts:
-            - name: Linux_Test_Logs
+            - name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
-            - name: Linux_Test_Results
+            - name: Linux_Test_Results_Attempt_$(System.JobAttempt)
               path: artifacts/TestResults/
               publishOnError: true
               includeForks: true
@@ -698,11 +700,44 @@ extends:
                 SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
             artifacts:
-            - name: Helix_logs
+            - name: Helix_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
 
+        # Local development validation
+        - ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
+          - template: .azure/pipelines/jobs/default-build.yml@self
+            parameters:
+              jobName: Local_Windows
+              jobDisplayName: 'Test: Windows local development validation'
+              agentOs: Windows
+              timeoutInMinutes: 240
+              steps:
+              - script: git submodule update --init
+                displayName: Update submodules
+              - script: ./restore.cmd
+                displayName: Run restore.cmd
+              - script: npm run build
+                displayName: Build JS
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+                displayName: Build (Debug)
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+                displayName: Build (Release)
+              - script: ./src/ProjectTemplates/build.cmd
+                        -test
+                        -NoRestore
+                        -NoBuild
+                        -NoBuildDeps
+                        -configuration Release
+                displayName: Run project template tests
+
+              artifacts:
+              - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
+                path: artifacts/log/
+                publishOnError: true
+                includeForks: true
+
       # Source build
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters: