Merge branch 'dotnet:main' into ensure-that-the-HubClientProxyGenerat…

…or-correctly-processes-both-explicit-and-inferred-generic-type-arguments
dotnet · Aug 1, 2024 · 3d035a8 · 3d035a8
2 parents d3e0a0a + 0fee04e
commit 3d035a8
Show file tree

Hide file tree

Showing 1,149 changed files with 35,874 additions and 13,777 deletions.
diff --git a/.azure/pipelines/blazor-daily-tests.yml b/.azure/pipelines/blazor-daily-tests.yml
@@ -7,7 +7,6 @@
 # We just need one Windows machine because all it does is trigger SauceLabs.
 variables:
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-      - group: DotNet-MSRC-Storage
       - group: AzureDevOps-Artifact-Feeds-Pats
   - name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL
     value: true

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
@@ -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:
@@ -573,16 +576,16 @@ stages:
         agentOs: macOS
         timeoutInMinutes: 90
         isAzDOTestingJob: true
-        buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
+        buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
         beforeBuild:
         - 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
@@ -594,18 +597,18 @@ stages:
         agentOs: Linux
         isAzDOTestingJob: true
         useHostedUbuntu: false
-        buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
+        buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
         beforeBuild:
         - bash: "./eng/scripts/install-nginx-linux.sh"
           displayName: Installing Nginx
         - 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,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)
@@ -114,6 +113,11 @@ variables:
 - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
   - name: _SignType
     value: test
+# Exclude artifacts & .packages folders from CodeQL scans
+- name: LGTM_INDEX_FILTERS
+  value: |
+    exclude:.packages
+    exclude:artifacts
 - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
 resources:
@@ -138,6 +142,8 @@ extends:
         name: NetCore1ESPool-Svc-Internal
         image: windows.vs2022.amd64
         os: windows
+      spotBugs:
+        enabled: false
     containers:
       alpine319WithNode:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
@@ -160,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
@@ -286,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
@@ -318,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
@@ -348,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
@@ -410,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
@@ -440,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
@@ -487,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
@@ -518,10 +524,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
@@ -554,7 +559,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
@@ -587,7 +592,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
@@ -616,11 +621,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
@@ -632,16 +637,16 @@ extends:
             agentOs: macOS
             timeoutInMinutes: 90
             isAzDOTestingJob: true
-            buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
+            buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
             beforeBuild:
             - 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
@@ -653,18 +658,18 @@ extends:
             agentOs: Linux
             isAzDOTestingJob: true
             useHostedUbuntu: false
-            buildArgs: --all --test --binaryLog "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
+            buildArgs: --all --test --binaryLog /p:RunTemplateTests=false /p:SkipHelixReadyTests=true $(_InternalRuntimeDownloadArgs)
             beforeBuild:
             - bash: "./eng/scripts/install-nginx-linux.sh"
               displayName: Installing Nginx
             - 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
@@ -691,14 +696,15 @@ 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
 
       # 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'

diff --git a/.azure/pipelines/components-e2e-tests.yml b/.azure/pipelines/components-e2e-tests.yml
@@ -25,8 +25,6 @@ variables:
   value: true
 - name: _TeamName
   value:  AspNetCore
-- name: npm_config_cache
-  value: src/submodules/Node-Externals/cache
 - name: PUPPETEER_SKIP_DOWNLOAD
   value: 1
 - template: /eng/common/templates/variables/pool-providers.yml
@@ -45,7 +43,7 @@ jobs:
       displayName: Update submodules
     - script: ./restore.sh
       displayName: Run restore.sh
-    - script: npm ci --offline
+    - script: npm ci
       displayName: NPM install
     - script: npm run build
       displayName: Build JS

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