Merge branch 'main' into linux-dev-certs

dotnet · Jul 23, 2024 · cf57d2c · cf57d2c
2 parents 42a6608 + ef09c06
commit cf57d2c
Show file tree

Hide file tree

Showing 363 changed files with 11,506 additions and 2,803 deletions.
diff --git a/.azure/pipelines/ci-public.yml b/.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
@@ -462,7 +462,7 @@ stages:
       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 +495,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 +528,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
@@ -556,15 +556,22 @@ stages:
         beforeBuild:
         - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
           displayName: Setup IISExpress test certificates and schema
+        afterBuild:
+        - powershell: ./eng/scripts/CompareMinifiedJsFiles.ps1
+          displayName: Check for changes in generated minified .js files
         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 +585,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 +608,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 +639,7 @@ 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

diff --git a/.azure/pipelines/ci.yml b/.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)
@@ -167,7 +166,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 +292,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 +324,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 +354,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 +416,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 +446,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 +493,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
@@ -528,7 +527,7 @@ extends:
           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 +560,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 +593,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 +622,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 +643,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 +666,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,7 +697,7 @@ 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

diff --git a/.azure/pipelines/jobs/codesign-xplat.yml b/.azure/pipelines/jobs/codesign-xplat.yml
@@ -45,7 +45,7 @@ jobs:
         $(_InternalRuntimeDownloadCodeSignArgs)
       displayName: Sign and publish packages
     artifacts:
-    - name: CodeSign_Xplat_${{ parameters.inputName }}_Logs
+    - name: CodeSign_Xplat_${{ parameters.inputName }}_Logs_Attempt_$(System.JobAttempt)
       path: artifacts/log/
       publishOnError: true
       includeForks: true

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -420,7 +420,18 @@ jobs:
       - ${{ parameters.beforeBuild }}
 
       # - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self
-      # - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml@self
+      - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml@self
+
+      # Populate dotnetbuilds-internal-container-read-token
+      - template: /eng/common/templates-official/steps/get-delegation-sas.yml
+        parameters:
+          federatedServiceConnection: 'dotnetbuilds-internal-read'
+          outputVariableName: 'dotnetbuilds-internal-container-read-token'
+          expiryInHours: 1
+          base64Encode: false
+          storageAccount: dotnetbuilds
+          container: internal
+          permissions: rl
 
       # Add COMPlus_* environment variables to build steps.
       - ${{ if ne(parameters.steps, '')}}:

diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
@@ -50,7 +50,7 @@ jobs:
     jobDisplayName: 'Tests: Helix'
     agentOs: Windows
     installJdk: false
-    timeoutInMinutes: 120
+    timeoutInMinutes: 150
     steps:
     # Build the shared framework
     - script: ./eng/build.cmd -ci -prepareMachine -nobl -all -noBuildJava -pack -arch x64
@@ -110,7 +110,7 @@ jobs:
     jobName: MacOS_Quarantined_Test
     jobDisplayName: "Tests: macOS"
     agentOs: macOS
-    timeoutInMinutes: 120
+    timeoutInMinutes: 150
     isAzDOTestingJob: true
     enablePublishTestResults: false
     steps: