Merge branch 'master' into merge/release/5.0-preview7-to-master

Author: pranavkm

.azure/pipelines/ci.yml

@@ -433,7 +433,8 @@ stages:
       jobName: Linux_musl_x64_build
       jobDisplayName: "Build: Linux Musl x64"
       agentOs: Linux
-      buildScript: ./dockerbuild.sh alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-WithNode-0fc54a3-20190918214015
+      buildScript: ./build.sh
       buildArgs:
         --arch x64
         --os-name linux-musl
@@ -448,6 +449,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       installJdk: false
+      skipComponentGovernanceDetection: true
       artifacts:
       - name: Linux_musl_x64_Logs
         path: artifacts/log/
@@ -466,7 +468,8 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM64"
       agentOs: Linux
       useHostedUbuntu: false
-      buildScript: ./dockerbuild.sh ubuntu-alpine37
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-20200413125008-406629a
+      buildScript: ./build.sh
       buildArgs:
         --arch arm64
         --os-name linux-musl

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

@@ -35,7 +35,8 @@
 #       Specifies what directory to run build.sh/cmd
 #   buildScript: string
 #       Specifies the build script to run. Defaults to build.sh or build.cmd.
-
+#   skipComponentGovernanceDetection: boolean
+#       Determines if component governance detection can be skipped
 #
 # See https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema for details
 #
@@ -60,6 +61,7 @@ parameters:
   installJdk: true
   timeoutInMinutes: 180
   useHostedUbuntu: true
+  skipComponentGovernanceDetection: false
 
   # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
   # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build
@@ -114,6 +116,8 @@ jobs:
           name: NetCoreInternal-Pool
           # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
           queue: BuildPool.Server.Amd64.VS2019
+    ${{ if ne(parameters.container, '') }}:
+      container: ${{ parameters.container }}
     variables:
     - AgentOsName: ${{ parameters.agentOs }}
     - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@@ -238,7 +242,7 @@ jobs:
         continueOnError: true
         condition: always()
 
-    - ${{ if and(startsWith(parameters.jobDisplayName, 'Build:'), ne(variables['skipComponentGovernanceDetection'], 'true'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - ${{ if and(startsWith(parameters.jobDisplayName, 'Build:'), ne(variables['skipComponentGovernanceDetection'], 'true'), ne(parameters.skipComponentGovernanceDetection, 'true'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
         condition: and(succeeded(), ne(variables['CG_RAN'], 'true'))
         displayName: 'Component Detection'

.azure/pipelines/quarantined-pr.yml

@@ -0,0 +1,149 @@
+# We want to run quarantined tests on master as well as on PRs
+trigger:
+  batch: true
+  branches:
+    include:
+    - master
+
+schedules:
+- cron: "0 */4 * * *"
+  displayName: Every 4 hours test run
+  branches:
+    include:
+    - master
+  always: true
+
+variables:
+- ${{ if ne(variables['System.TeamProject'], 'internal') }}:
+  - name: _UseHelixOpenQueues
+    value: 'true'
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - group: DotNet-HelixApi-Access
+  - name: _UseHelixOpenQueues
+    value: 'false'
+
+jobs:
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Helix_quarantined_x64
+    jobDisplayName: 'Tests: Helix'
+    agentOs: Windows
+    timeoutInMinutes: 240
+    steps:
+    # Build the shared framework
+    - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      displayName: Build shared fx
+    - script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
+      displayName: Restore interop projects
+    - script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
+              -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
+              /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      displayName: Run build.cmd helix target
+      continueOnError: true
+      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
+
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Windows_Quarantined_x64
+    jobDisplayName: 'Tests: Windows x64'
+    agentOs: Windows
+    timeoutInMinutes: 240
+    isTestingJob: true
+    steps:
+    - powershell: "& ./build.ps1 -CI -nobl -all -pack -NoBuildJava"
+      displayName: Build
+    # The templates part can be removed when the Blazor Templates run on Helix
+    - script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
+      displayName: Pack Templates
+    - script: ./build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /p:RunQuarantinedTests=true /p:SkipHelixReadyTests=true"
+      displayName: Run Quarantined Tests
+      continueOnError: true
+    - task: PublishTestResults@2
+      displayName: Publish Quarantined Test Results
+      inputs:
+        testResultsFormat: 'xUnit'
+        testResultsFiles: '*.xml'
+        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
+      condition: always()
+    artifacts:
+    - name: Windows_Quarantined_Test_Logs
+      path: artifacts/log/
+      publishOnError: true
+      includeForks: true
+    - name: Windows_Quarantined_Test_Results
+      path: artifacts/TestResults/
+      publishOnError: true
+      includeForks: true
+
+- template: jobs/default-build.yml
+  parameters:
+    jobName: MacOS_Quarantined_Test
+    jobDisplayName: "Tests: macOS 10.14"
+    agentOs: macOS
+    timeoutInMinutes: 240
+    isTestingJob: true
+    steps:
+    - bash: ./build.sh --all --pack --ci --nobl --no-build-java
+      displayName: Build
+    # The templates part can be removed when the Blazor Templates run on Helix
+    - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
+      displayName: Pack Templates (for Template tests)
+    - bash: ./build.sh --no-build --ci --nobl --test -p:RunTemplateTests=true -p:RunQuarantinedTests=true -p:SkipHelixReadyTests=true
+      displayName: Run Quarantined Tests
+      continueOnError: true
+    - task: PublishTestResults@2
+      displayName: Publish Quarantined Test Results
+      inputs:
+        testResultsFormat: 'xUnit'
+        testResultsFiles: '*.xml'
+        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
+      condition: always()
+    artifacts:
+    - name: MacOS_Quarantined_Test_Logs
+      path: artifacts/log/
+      publishOnError: true
+      includeForks: true
+    - name: MacOS_Quarantined_Test_Results
+      path: artifacts/TestResults/
+      publishOnError: true
+      includeForks: true
+
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Linux_Quarantined_Test
+    jobDisplayName: "Tests: Ubuntu 16.04 x64"
+    agentOs: Linux
+    timeoutInMinutes: 240
+    isTestingJob: true
+    useHostedUbuntu: false
+    steps:
+    - bash: ./build.sh --all --pack --ci --nobl --no-build-java
+      displayName: Build
+    # The templates part can be removed when the Blazor Templates run on Helix
+    - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
+      displayName: Pack Templates (for Template tests)
+    - bash: ./build.sh --no-build --ci --nobl --test -p:RunTemplateTests=true -p:RunQuarantinedTests=true -p:SkipHelixReadyTests=true
+      displayName: Run Quarantined Tests
+      continueOnError: true
+    - task: PublishTestResults@2
+      displayName: Publish Quarantined Test Results
+      inputs:
+        testResultsFormat: 'xUnit'
+        testResultsFiles: '*.xml'
+        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
+      condition: always()
+    artifacts:
+    - name: Linux_Quarantined_Test_Logs
+      path: artifacts/log/
+      publishOnError: true
+      includeForks: true
+    - name: Linux_Quarantined_Test_Results
+      path: artifacts/TestResults/
+      publishOnError: true
+      includeForks: true

.azure/pipelines/quarantined-tests.yml

@@ -1,13 +1,10 @@
-# We want to run quarantined tests on master as well as on PRs
-trigger:
-  batch: true
-  branches:
-    include:
-    - master
+# We only want to run quarantined tests on master
+pr: none
+trigger: none
 
 schedules:
-- cron: "0 */4 * * *"
-  displayName: Every 4 hours test run
+- cron: "0 18 * * *"
+  displayName: Run tests once a day at 11 PM
   branches:
     include:
     - master
@@ -28,15 +25,15 @@ jobs:
     jobName: Helix_quarantined_x64
     jobDisplayName: 'Tests: Helix'
     agentOs: Windows
-    timeoutInMinutes: 180
+    timeoutInMinutes: 480
     steps:
     # Build the shared framework
     - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
       displayName: Build shared fx
     - script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
       displayName: Restore interop projects
     - script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-              -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
+              -projects eng\helix\helix.proj /p:IsHelixDaily=true /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true
               /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
       displayName: Run build.cmd helix target
       continueOnError: true
@@ -48,102 +45,27 @@ jobs:
       path: artifacts/log/
       publishOnError: true
 
+# Helix ARM64
 - template: jobs/default-build.yml
   parameters:
-    jobName: Windows_Quarantined_x64
-    jobDisplayName: 'Tests: Windows x64'
-    agentOs: Windows
-    timeoutInMinutes: 180
-    isTestingJob: true
-    steps:
-    - powershell: "& ./build.ps1 -CI -nobl -all -pack -NoBuildJava"
-      displayName: Build
-    # The templates part can be removed when the Blazor Templates run on Helix
-    - script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
-      displayName: Pack Templates
-    - script: ./build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /p:RunQuarantinedTests=true /p:SkipHelixReadyTests=true"
-      displayName: Run Quarantined Tests
-      continueOnError: true
-    - task: PublishTestResults@2
-      displayName: Publish Quarantined Test Results
-      inputs:
-        testResultsFormat: 'xUnit'
-        testResultsFiles: '*.xml'
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
-      condition: always()
-    artifacts:
-    - name: Windows_Quarantined_Test_Logs
-      path: artifacts/log/
-      publishOnError: true
-      includeForks: true
-    - name: Windows_Quarantined_Test_Results
-      path: artifacts/TestResults/
-      publishOnError: true
-      includeForks: true
-
-- template: jobs/default-build.yml
-  parameters:
-    jobName: MacOS_Quarantined_Test
-    jobDisplayName: "Tests: macOS 10.14"
-    agentOs: macOS
-    timeoutInMinutes: 180
-    isTestingJob: true
-    steps:
-    - bash: ./build.sh --all --pack --ci --nobl --no-build-java
-      displayName: Build
-    # The templates part can be removed when the Blazor Templates run on Helix
-    - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
-      displayName: Pack Templates (for Template tests)
-    - bash: ./build.sh --no-build --ci --nobl --test -p:RunTemplateTests=true -p:RunQuarantinedTests=true -p:SkipHelixReadyTests=true
-      displayName: Run Quarantined Tests
-      continueOnError: true
-    - task: PublishTestResults@2
-      displayName: Publish Quarantined Test Results
-      inputs:
-        testResultsFormat: 'xUnit'
-        testResultsFiles: '*.xml'
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
-      condition: always()
-    artifacts:
-    - name: MacOS_Quarantined_Test_Logs
-      path: artifacts/log/
-      publishOnError: true
-      includeForks: true
-    - name: MacOS_Quarantined_Test_Results
-      path: artifacts/TestResults/
-      publishOnError: true
-      includeForks: true
-
-- template: jobs/default-build.yml
-  parameters:
-    jobName: Linux_Quarantined_Test
-    jobDisplayName: "Tests: Ubuntu 16.04 x64"
+    jobName: Helix_quarantined_arm64
+    jobDisplayName: "Tests: Helix ARM64"
     agentOs: Linux
-    timeoutInMinutes: 180
-    isTestingJob: true
-    useHostedUbuntu: false
+    timeoutInMinutes: 480
     steps:
-    - bash: ./build.sh --all --pack --ci --nobl --no-build-java
-      displayName: Build
-    # The templates part can be removed when the Blazor Templates run on Helix
-    - bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
-      displayName: Pack Templates (for Template tests)
-    - bash: ./build.sh --no-build --ci --nobl --test -p:RunTemplateTests=true -p:RunQuarantinedTests=true -p:SkipHelixReadyTests=true
-      displayName: Run Quarantined Tests
+    - script: ./restore.sh -ci -nobl
+      displayName: Restore
+    - script: ./build.sh --ci --nobl --noBuildRepoTasks --arch arm64 -test --no-build-nodejs --all --projects
+              $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:RunQuarantinedTests=true
+              /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+      displayName: Run build.sh helix arm64 target
       continueOnError: true
-    - task: PublishTestResults@2
-      displayName: Publish Quarantined Test Results
-      inputs:
-        testResultsFormat: 'xUnit'
-        testResultsFiles: '*.xml'
-        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Quarantined'
-      condition: always()
+      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: Linux_Quarantined_Test_Logs
+    - name: Helix_arm64_logs
       path: artifacts/log/
       publishOnError: true
       includeForks: true
-    - name: Linux_Quarantined_Test_Results
-      path: artifacts/TestResults/
-      publishOnError: true
-      includeForks: true

.github/CODEOWNERS

@@ -9,14 +9,16 @@
 /eng/common/                    @dotnet-maestro-bot
 /eng/Versions.props             @dotnet-maestro-bot @dougbu
 /eng/Version.Details.xml        @dotnet-maestro-bot @dougbu
-/src/Components/                @SteveSandersonMS
+/src/Components/                @SteveSandersonMS @aspnet-blazor-eng
 /src/DefaultBuilder/            @tratcher
 /src/Hosting/                   @tratcher
 /src/Http/                      @tratcher @jkotalik
 /src/Middleware/                @tratcher
 /src/Middleware/HttpsPolicy/    @jkotalik
 /src/Middleware/Rewrite/        @jkotalik
-# /src/ProjectTemplates/          @ryanbrandenburg
+# /src/ProjectTemplates/        @ryanbrandenburg
+/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/  @aspnet-blazor-eng
+/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/  @aspnet-blazor-eng
 /src/Security/                  @tratcher
 /src/Servers/                   @tratcher @jkotalik @halter73
 /src/Shared/runtime/            @dotnet/http