Merge branch 'master' into merge/release/3.1-to-master

Author: John Luo

.azure/pipelines/ci.yml

@@ -7,9 +7,9 @@ trigger:
   batch: true
   branches:
     include:
+    - blazor-wasm
     - master
     - release/*
-    - internal/release/3.*
 
 # Run PR validation on all branches
 pr:
@@ -32,6 +32,8 @@ variables:
 - name: _DotNetValidationArtifactsCategory
   value: .NETCORE
 - ${{ if ne(variables['System.TeamProject'], 'internal') }}:
+  - name: _UseHelixOpenQueues
+    value: 'true'
   - name: _BuildArgs
     value: ''
   - name: _PublishArgs
@@ -51,7 +53,9 @@ variables:
   # to have it in two different forms
   - name: _InternalRuntimeDownloadCodeSignArgs
     value: /p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
-- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - group: DotNet-HelixApi-Access
+  - name: _UseHelixOpenQueues
+    value: 'false'
   - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
     # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
     # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
@@ -82,7 +86,7 @@ variables:
   # used for post-build phases, internal builds only
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - group: DotNet-AspNet-SDLValidation-Params
-    
+
 stages:
 - stage: build
   displayName: Build
@@ -151,7 +155,7 @@ stages:
 
       # Build the x86 shared framework
       # TODO: make it possible to build for one Windows architecture at a time
-      # This is going to actually build x86 native assets. See https://github.com/aspnet/AspNetCore/issues/7196
+      # This is going to actually build x86 native assets. See https://github.com/dotnet/aspnetcore/issues/7196
       - script: ./build.cmd
                 -ci
                 -arch x86
@@ -172,6 +176,7 @@ stages:
                 -noBuildDeps
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
+        condition: ne(variables['Build.Reason'], 'PullRequest')
         displayName: Build SiteExtension
 
       # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
@@ -489,7 +494,7 @@ stages:
       jobDisplayName: "Test: Windows Server 2016 x64"
       agentOs: Windows
       isTestingJob: true
-      buildArgs: -all -pack -test -BuildNative "/p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
+      buildArgs: -all -pack -test -BuildNative "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
       beforeBuild:
       - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
         displayName: Setup IISExpress test certificates and schema
@@ -507,7 +512,7 @@ stages:
       - name: Windows_Test_Dumps
         path: artifacts/dumps/
         publishOnError: true
-        includeForks: false
+        includeForks: true
       - name: Windows_Test_Logs
         path: artifacts/log/
         publishOnError: true
@@ -543,7 +548,7 @@ stages:
       - name: Windows_Test_Templates_Dumps
         path: artifacts/dumps/
         publishOnError: true
-        includeForks: false
+        includeForks: true
       - name: Windows_Test_Templates_Logs
         path: artifacts/log/
         publishOnError: true
@@ -560,7 +565,7 @@ stages:
       jobDisplayName: "Test: macOS 10.13"
       agentOs: macOS
       isTestingJob: true
-      buildArgs: --all --test "/p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
+      buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
       beforeBuild:
       - bash: "./eng/scripts/install-nginx-mac.sh"
         displayName: Installing Nginx
@@ -595,7 +600,7 @@ stages:
       jobDisplayName: "Test: Ubuntu 16.04 x64"
       agentOs: Linux
       isTestingJob: true
-      buildArgs: --all --test "/p:RunTemplateTests=false"  $(_InternalRuntimeDownloadArgs)
+      buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
       beforeBuild:
       - bash: "./eng/scripts/install-nginx-linux.sh"
         displayName: Installing Nginx
@@ -625,6 +630,72 @@ stages:
         publishOnError: true
         includeForks: true
 
+# Helix x64
+  - template: jobs/default-build.yml
+    parameters:
+      condition: eq(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_x64
+      jobDisplayName: 'Tests: Helix x64'
+      agentOs: Windows
+      timeoutInMinutes: 180
+      steps:
+      - script: .\restore.cmd -ci
+        displayName: Restore
+      - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
+        displayName: Run build.cmd helix target
+        env:
+          HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+      artifacts:
+      - name: Helix_logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
+  - template: jobs/default-build.yml
+    parameters:
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_x64_daily
+      jobDisplayName: 'Tests: Helix x64 Daily'
+      agentOs: Windows
+      timeoutInMinutes: 180
+      steps:
+      - script: .\restore.cmd -ci
+        displayName: Restore
+      - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
+        displayName: Run build.cmd helix target
+        env:
+          HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+      artifacts:
+      - name: Helix_logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
+  # Helix ARM64
+  - template: jobs/default-build.yml
+    parameters:
+      condition: ne(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_arm64_daily
+      jobDisplayName: "Tests: Helix ARM64 Daily"
+      agentOs: Linux
+      timeoutInMinutes: 180
+      steps:
+      - script: ./restore.sh -ci
+        displayName: Restore
+      - script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
+        displayName: Run build.sh helix arm64 target
+        env:
+          HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
+          SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
+      installNodeJs: false
+      artifacts:
+      - name: Helix_arm64_logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
   # Source build
   - job: Source_Build
     displayName: 'Test: Linux Source Build'
@@ -642,17 +713,6 @@ stages:
         chmod +x $HOME/bin/jq
         echo "##vso[task.prependpath]$HOME/bin"
       displayName: Install jq
-    - task: UseDotNet@2
-      displayName: 'Use .NET Core sdk'
-      inputs:
-        packageType: sdk
-        # The SDK version selected here is intentionally supposed to use the latest release
-        # For the purpose of building Linux distros, we can't depend on features of the SDK
-        # which may not exist in pre-built versions of the SDK
-        # Pinning to preview 8 since preview 9 has breaking changes
-        version: 3.1.100
-        installationPath: $(DotNetCoreSdkDir)
-        includePreviewVersions: true
     - ${{ if ne(variables['System.TeamProject'], 'public') }}:
         - task: Bash@3
           displayName: Setup Private Feeds Credentials
@@ -713,6 +773,7 @@ stages:
     parameters:
       # See https://github.com/dotnet/arcade/issues/2871
       enableSymbolValidation: false
+      enableSigningValidation: false
       publishInstallersAndChecksums: true
       # This is to enable SDL runs part of Post-Build Validation Stage
       SDLValidationParameters:

.azure/pipelines/devBuilds.yml

@@ -0,0 +1,118 @@
+#
+# See https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema for details on this file.
+#
+
+# Configure which branches trigger builds
+trigger: none
+
+# no PR builds
+pr: none
+
+# Schedule this pipeline to run every midnight
+schedules:
+- cron: "0 8 * * *"
+  displayName: Daily midnight Dev builds
+  branches:
+    include:
+    - master
+  always: true
+
+stages:
+- stage: build_components
+  displayName: Build Components
+  jobs:
+  # Build components on Windows (x64)
+  - template: jobs/default-build.yml
+    parameters:
+      codeSign: false
+      jobName: Windows_build
+      jobDisplayName: "Build: Components"
+      agentOs: Windows
+      steps:
+      - script: git submodule init
+      - script: git submodule update --recursive
+      - script: cd ./src/Components
+      - script: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.components.x64.binlog
+        displayName: Build x64
+      artifacts:
+      - name: Windows_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
+- stage: build_servers
+  displayName: Build Servers
+  jobs:
+  # Build servers on Windows (x64)
+  - template: jobs/default-build.yml
+    parameters:
+      codeSign: false
+      jobName: Windows_build
+      jobDisplayName: "Build: Servers"
+      agentOs: Windows
+      steps:
+      - script: git submodule init
+      - script: git submodule update --recursive
+      - script: cd ./src/Servers
+      - script: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.servers.x64.binlog
+        displayName: Build x64
+      artifacts:
+      - name: Windows_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
+- stage: build_project_templates
+  displayName: Build Project Templates
+  jobs:
+  # Build servers on Windows (x64)
+  - template: jobs/default-build.yml
+    parameters:
+      codeSign: false
+      jobName: Windows_build
+      jobDisplayName: "Build: Project Templates"
+      agentOs: Windows
+      steps:
+      - script: git submodule init
+      - script: git submodule update --recursive
+      - script: cd ./src/ProjectTemplates
+      - script: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.projectTemplates.x64.binlog
+        displayName: Build x64
+      artifacts:
+      - name: Windows_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+
+- stage: build_all
+  displayName: Build Everything
+  jobs:
+  # Build servers on Windows (x64)
+  - template: jobs/default-build.yml
+    parameters:
+      codeSign: false
+      jobName: Windows_build
+      jobDisplayName: "Build: Everything"
+      agentOs: Windows
+      steps:
+      - script: git submodule init
+      - script: git submodule update --recursive
+      - script: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.all.x64.binlog
+        displayName: Build x64
+      artifacts:
+      - name: Windows_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true

.azure/pipelines/helix-test.yml

@@ -1,23 +1,35 @@
-# Don't run CI for this config yet. We're not ready to move official builds on to Azure Pipelines
-trigger: none
+# We want to run quarantined tests on master as well as on PRs
+trigger:
+  batch: true
+  branches:
+    include:
+    - master
 
 # Run PR validation on all branches
 pr:
   branches:
     include:
     - '*'
 
+variables:
+- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
+  - name: _UseHelixOpenQueues
+    value: 'true'
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - name: _UseHelixOpenQueues
+    value: 'false'
+
 jobs:
 - template: jobs/default-build.yml
   parameters:
-    jobName: Helix_x64
-    jobDisplayName: 'Tests: Helix x64'
+    jobName: Helix_quarantine_x64
+    jobDisplayName: 'Tests: Helix Quarantine x64'
     agentOs: Windows
     timeoutInMinutes: 240
     steps:
     - script: .\restore.cmd -ci
       displayName: Restore
-    - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true -bl
+    - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
       displayName: Run build.cmd helix target
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops

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

@@ -81,7 +81,7 @@ jobs:
       enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
     enablePublishTestResults: true # publish test results to AzDO (populates AzDO Tests tab)
     enableTelemetry: true
-    helixRepo: aspnet/AspNetCore
+    helixRepo: dotnet/aspnetcore
     helixType: build.product/
     workspace:
       clean: all
@@ -97,14 +97,14 @@ jobs:
           name: NetCorePublic-Pool
           ${{ if ne(parameters.isTestingJob, true) }}:
             # Visual Studio Build Tools
-            queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open
+            queue: BuildPool.Server.Amd64.VS2019.BT.Open
           ${{ if eq(parameters.isTestingJob, true) }}:
             # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
-            queue: BuildPool.Windows.10.Amd64.VS2019.Open
+            queue: BuildPool.Server.Amd64.VS2019.Open
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: NetCoreInternal-Pool
           # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
-          queue: BuildPool.Windows.10.Amd64.VS2019
+          queue: BuildPool.Server.Amd64.VS2019
     variables:
     - AgentOsName: ${{ parameters.agentOs }}
     - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@@ -251,6 +251,7 @@ jobs:
         condition: always()
         inputs:
           testRunner: junit
-          testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
+          testResultsFiles: '**/TEST-junit-jupiter.xml'
           buildConfiguration: $(BuildConfiguration)
           buildPlatform: $(AgentOsName)
+          mergeTestResults: true