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

Author: dougbu

.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 notin(variables['Build.Reason'], 'PullRequest') }}:
     # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
     # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
@@ -150,8 +154,7 @@ stages:
         displayName: Build x64
 
       # 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.
       - script: ./build.cmd
                 -ci
                 -arch x86
@@ -172,6 +175,8 @@ stages:
                 -noBuildDeps
                 $(_BuildArgs)
                 $(_InternalRuntimeDownloadArgs)
+        # Disabled until 3.1.3 is released
+        condition: false
         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,
@@ -249,6 +254,38 @@ stages:
       - name: Windows_arm_Packages
         path: artifacts/packages/
 
+  # Build Windows ARM64
+  - template: jobs/default-build.yml
+    parameters:
+      codeSign: true
+      jobName: Windows_64_build
+      jobDisplayName: "Build: Windows ARM64"
+      agentOs: Windows
+      buildArgs:
+        -arch arm64
+        -sign
+        -pack
+        -noBuildNodeJS
+        -noBuildJava
+        /bl:artifacts/log/build.win-arm64.binlog
+        /p:DotNetSignType=$(_SignType)
+        /p:OnlyPackPlatformSpecificPackages=true
+        /p:AssetManifestFileName=aspnetcore-win-arm64.xml
+        $(_BuildArgs)
+        $(_PublishArgs)
+        $(_InternalRuntimeDownloadArgs)
+      installNodeJs: false
+      installJdk: false
+      artifacts:
+      - name: Windows_arm64_Logs
+        path: artifacts/log/
+        publishOnError: true
+        includeForks: true
+      - name: Windows_arm64_Packages
+        path: artifacts/packages/
+      - name: Windows_arm64_Installers
+        path: artifacts/installers/
+
   # Build MacOS
   - template: jobs/default-build.yml
     parameters:
@@ -489,25 +526,25 @@ 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
       afterBuild:
-      - powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunFlakyTests=true"
-        displayName: Run Flaky Tests
+      - powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunQuarantinedTests=true"
+        displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
-        displayName: Publish Flaky Test Results
+        displayName: Publish Quarantined Test Results
         inputs:
           testResultsFormat: 'xUnit'
           testResultsFiles: '*.xml'
-          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
+          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
       artifacts:
       - name: Windows_Test_Dumps
         path: artifacts/dumps/
         publishOnError: true
-        includeForks: false
+        includeForks: true
       - name: Windows_Test_Logs
         path: artifacts/log/
         publishOnError: true
@@ -543,7 +580,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 +597,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
@@ -569,15 +606,15 @@ stages:
         displayName: Pack Packages (for Template tests)
       - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
         displayName: Pack Templates (for Template tests)
-      - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
-        displayName: Run Flaky Tests
+      - bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
+        displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
-        displayName: Publish Flaky Test Results
+        displayName: Publish Quarantined Test Results
         inputs:
           testResultsFormat: 'xUnit'
           testResultsFiles: '*.xml'
-          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
+          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
       artifacts:
       - name: MacOS_Test_Logs
         path: artifacts/log/
@@ -595,7 +632,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
@@ -606,15 +643,15 @@ stages:
         displayName: Pack Packages (for Template tests)
       - bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
         displayName: Pack Templates (for Template tests)
-      - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
-        displayName: Run Flaky Tests
+      - bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
+        displayName: Run Quarantined Tests
         continueOnError: true
       - task: PublishTestResults@2
-        displayName: Publish Flaky Test Results
+        displayName: Publish Quarantined Test Results
         inputs:
           testResultsFormat: 'xUnit'
           testResultsFiles: '*.xml'
-          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
+          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
       artifacts:
       - name: Linux_Test_Logs
         path: artifacts/log/
@@ -625,6 +662,80 @@ stages:
         publishOnError: true
         includeForks: true
 
+  # Helix x64
+  - template: jobs/default-build.yml
+    parameters:
+      condition: in(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_x64
+      jobDisplayName: 'Tests: Helix x64'
+      agentOs: Windows
+      timeoutInMinutes: 180
+      steps:
+      # Build the shared framework
+      - script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
+        displayName: Build shared fx
+      - script: .\restore.cmd -ci /p:BuildInteropProjects=true
+        displayName: Restore
+      - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=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: notin(variables['Build.Reason'], 'PullRequest')
+      jobName: Helix_x64_daily
+      jobDisplayName: 'Tests: Helix x64 Daily'
+      agentOs: Windows
+      timeoutInMinutes: 180
+      steps:
+      # Build the shared framework
+      - script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
+        displayName: Build shared fx
+      # Build the x86 shared framework
+      - script: .\restore.cmd -ci /p:BuildInteropProjects=true
+        displayName: Restore
+      - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=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: and(eq(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'))
+      jobName: Helix_arm64_daily
+      jobDisplayName: "Tests: Helix ARM64 Daily"
+      agentOs: Linux
+      timeoutInMinutes: 180
+      steps:
+      # Build the shared framework
+      - 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 +753,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