Merge remote-tracking branch 'aspnet/master' into spa-extensions-other

Author: Ellis Kenyo

.azure/pipelines/ci.yml

@@ -10,14 +10,38 @@ pr:
 jobs:
 - template: jobs/default-build.yml
   parameters:
-    jobName: Helix
-    jobDisplayName: 'Tests: Helix'
+    jobName: Helix_x64
+    jobDisplayName: 'Tests: Helix x64'
     agentOs: Windows
     timeoutInMinutes: 240
     steps:
-    - script: .\build.cmd -all -ci /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\logs\SendToHelix.binlog
+    - 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
       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
     artifacts:
     - name: Helix_logs
+      path: artifacts/log/
+      publishOnError: true
+
+# Build Helix ARM64
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Helix_arm64
+    jobDisplayName: "Tests: Helix ARM64"
+    agentOs: Linux
+    timeoutInMinutes: 240
+    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:BuildAllProjects=true /p:BuildNative=true -bl
+      displayName: Run build.sh helix arm64 target
+      env:
+        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/logs/
       publishOnError: true

.azure/pipelines/helix-test.yml

@@ -6,7 +6,9 @@
 #   jobDisplayName: string
 #       The friendly job name to display in the UI. Defaults to the name of the OS.
 #   poolName: string
-#       The name of the VSTS agent queue to use.
+#       The name of the Azure DevOps agent pool to use.
+#   poolVmImage: string
+#       The name of a virtual machine image to use. Primarily of interest when using the Hosted pools.
 #   agentOs: string
 #       Used in templates to define variables which are OS specific. Typically from the set { Windows, Linux, macOS }
 #   buildArgs: string
@@ -28,9 +30,9 @@
 #   variables: { string: string }
 #     A map of custom variables
 #   matrix: { string: { string: string } }
-#     A map of matrix configurations and variables. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#matrix
+#     A map of matrix configurations and variables. https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#job
 #   dependsOn: string | [ string ]
-#     For fan-out/fan-in. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#phase
+#     For fan-out/fan-in. https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#job
 #   condition: string
 #     A condition which can be used to skip the job completely
 #   codeSign: boolean
@@ -47,6 +49,7 @@
 parameters:
   agentOs: 'Windows'
   poolName: ''
+  poolVmImage: ''
   buildArgs: ''
   configuration: 'Release'
   beforeBuild: []
@@ -64,7 +67,7 @@ parameters:
   buildScript: ''
   installNodeJs: true
   installJdk: true
-  timeoutInMinutes: 120
+  timeoutInMinutes: 180
 
 jobs:
 - job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
@@ -91,25 +94,37 @@ jobs:
     ${{ if ne(parameters.poolName, '') }}:
       name: ${{ parameters.poolName }}
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
+      ${{ if eq(variables['System.TeamProject'], 'public') }}:
+        name: NetCorePublic-Pool
+        ${{ if ne(parameters.isTestingJob, true) }}:
+          # Visual Studio Build Tools
+          queue: BuildPool.Windows.10.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
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        name: dotnet-internal-vs2019-preview
-      ${{ if ne(variables['System.TeamProject'], 'internal') }}:
-        name: dotnet-external-vs2019-preview
+        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
   variables:
     AgentOsName: ${{ parameters.agentOs }}
     ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
-    DOTNET_HOME: $(Agent.BuildDirectory)/.dotnet
+    DOTNET_HOME: $(Build.SourcesDirectory)/.dotnet
     BuildScript: ${{ parameters.buildScript }}
     BuildScriptArgs: ${{ parameters.buildArgs }}
     BuildConfiguration: ${{ parameters.configuration }}
     BuildDirectory: ${{ parameters.buildDirectory }}
+    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     TeamName: AspNetCore
-    ${{ if eq(parameters.agentOs, 'Windows') }}:
-      JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
-    ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}:
+    ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
+      JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
+    ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
       _SignType: ''
-    ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:
-      _SignType: real
+    ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
+      ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+        _SignType: real
+      ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+        _SignType: test
     ${{ insert }}: ${{ parameters.variables }}
   steps:
   - checkout: self
@@ -119,9 +134,21 @@ jobs:
       displayName: Install Node 10.x
       inputs:
         versionSpec: 10.x
+  - ${{ if eq(parameters.agentOs, 'Windows') }}:
+    - task: NuGetCommand@2
+      displayName: 'Clear NuGet caches'
+      condition: succeeded()
+      inputs:
+        command: custom
+        arguments: 'locals all -clear'
   - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
-    - powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1'
+    - powershell: ./eng/scripts/InstallJdk.ps1
       displayName: Install JDK 11
+    - ${{ if eq(parameters.isTestingJob, true) }}:
+      - powershell: |
+          Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(BuildDirectory)\artifacts\tmp\selenium\"
+          ./eng/scripts/InstallGoogleChrome.ps1
+        displayName: Install Chrome
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:
     - task: MicroBuildSigningPlugin@1
       displayName: Install MicroBuild Signing plugin
@@ -138,13 +165,13 @@ jobs:
   - ${{ if eq(parameters.steps, '')}}:
     - ${{ if eq(parameters.buildScript, '') }}:
       - ${{ if eq(parameters.agentOs, 'Windows') }}:
-        - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
+        - script: .\$(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.cmd
       - ${{ if ne(parameters.agentOs, 'Windows') }}:
-        - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
+        - script: ./$(BuildDirectory)/build.sh -ci -configuration $(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.sh
     - ${{ if ne(parameters.buildScript, '') }}:
-      - script: $(BuildScript) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
+      - script: $(BuildScript) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
         displayName: run $(BuildScript)
 
   - ${{ parameters.afterBuild }}
@@ -160,15 +187,6 @@ jobs:
       continueOnError: true
       condition: always()
 
-  - task: PublishTestResults@2
-    displayName: Publish test results
-    condition: always()
-    continueOnError: true
-    inputs:
-      testRunTitle: $(AgentOsName)-$(BuildConfiguration)
-      testRunner: vstest
-      testResultsFiles: '**/artifacts/**/*.trx'
-      mergeTestResults: true
   - ${{ each artifact in parameters.artifacts }}:
     - task: PublishBuildArtifacts@1
       displayName: Upload artifacts from ${{ artifact.path }}
@@ -186,6 +204,47 @@ jobs:
         artifactType: Container
         parallel: true
 
+  - ${{ if eq(parameters.isTestingJob, true) }}:
+    - task: PublishTestResults@2
+      displayName: Publish test results
+      condition: always()
+      continueOnError: true
+      inputs:
+        testRunTitle: $(AgentOsName)-$(BuildConfiguration)
+        testRunner: vstest
+        testResultsFiles: '**/artifacts/**/*.trx'
+        mergeTestResults: true
+        buildConfiguration: $(BuildConfiguration)
+        buildPlatform: $(AgentOsName)
+    - task: PublishTestResults@2
+      displayName: Publish test results
+      condition: always()
+      continueOnError: true
+      inputs:
+        testRunTitle: $(AgentOsName)-$(BuildConfiguration)
+        testRunner: xunit
+        testResultsFiles: '**/artifacts/TestResults/**/*.xml'
+        mergeTestResults: true
+        buildConfiguration: $(BuildConfiguration)
+        buildPlatform: $(AgentOsName)
+    - task: PublishTestResults@2
+      displayName: Publish js test results
+      condition: always()
+      inputs:
+        testRunner: junit
+        testResultsFiles: '**/artifacts/log/**/*.junit.xml'
+        buildConfiguration: $(BuildConfiguration)
+        buildPlatform: $(AgentOsName)
+    - task: PublishTestResults@2
+      displayName: Publish Java test results
+      condition: always()
+      inputs:
+        testRunner: junit
+        testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
+        buildConfiguration: $(BuildConfiguration)
+        buildPlatform: $(AgentOsName)
+
+
   - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
     - task: MicroBuildCleanup@1
       displayName: Cleanup MicroBuild tasks

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

@@ -14,4 +14,7 @@ jobs:
     agentOs: Windows
     jobName: SignalRDailyTests
     jobDisplayName: "SignalR Daily Tests"
-
+    artifacts:
+    - name: Windows_Logs
+      path: ../../artifacts/log/
+      publishOnError: true

.azure/pipelines/signalr-daily-tests.yml

@@ -1,32 +1,21 @@
-param($Mode)
-
-# TEMP TEMP TEMP
-# While doing https://github.com/aspnet/AspNetCore/pull/5705 I accidentally disabled ANCM on CI machines using
-# the registy key. Remove it to allow tests to pass
-
-Remove-Item "HKLM:\SOFTWARE\Microsoft\IIS Extensions\IIS AspNetCore Module V2\Parameters" -ErrorAction Ignore;
+param(
+    [string]$Mode,
+    [string[]]$exes
+)
 
 if (!($DumpFolder))
 {
-    $DumpFolder = "$PSScriptRoot\..\..\..\..\artifacts\logs\dumps"
+    $DumpFolder = "$PSScriptRoot\..\..\..\artifacts\log\dumps"
 }
 if (!(Test-Path $DumpFolder))
 {
     New-Item $DumpFolder -ItemType Directory;
 }
 $DumpFolder = Resolve-Path $DumpFolder
 
-$LogsFolder = "$PSScriptRoot\..\artifacts\logs"
-if (!(Test-Path $LogsFolder))
-{
-    New-Item $LogsFolder -ItemType Directory;
-}
-$LogsFolder = Resolve-Path $LogsFolder
-
 $werHive = "HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting";
 $ldHive = "$werHive\LocalDumps";
 
-
 function Setup-appverif($application)
 {
     appverif.exe -enable Exceptions Handles Heaps Leak Locks Memory Threadpool TLS SRWLock -for $application
@@ -70,7 +59,7 @@ function Shutdown-appverif($application)
 
 function Setup-Dumps()
 {
-    if (!(Test-Path $ldHive ))
+    if (!(Test-Path $ldHive))
     {
         New-Item -Path $werHive -Name LocalDumps
     }
@@ -88,13 +77,13 @@ function Setup-Dumps()
 
 function Shutdown-Dumps()
 {
-    Move-Item $env:windir\System32\_vsjitdebugger.exe $env:windir\System32\vsjitdebugger.exe;
+    Move-Item $env:windir\System32\_vsjitdebugger.exe $env:windir\System32\vsjitdebugger.exe -ErrorAction Ignore;
 
     Remove-Item $ldHive -Recurse -Force
 
     New-ItemProperty $werHive -Name "DontShowUI" -Value 0 -PropertyType "DWORD" -Force;
 
-    $cdb = "c:\Program Files (x86)\Windows Kits\10\Debuggers\x64\cdb.exe"
+    $cdb = "${env:ProgramFiles(x86)}\Windows Kits\10\Debuggers\x64\cdb.exe"
     if (!(Test-Path $cdb))
     {
         $downloadedFile = [System.IO.Path]::GetTempFileName();
@@ -116,24 +105,27 @@ function Shutdown-Dumps()
 
 if ($Mode -eq "Setup")
 {
-    Setup-appverif w3wp.exe
-    Setup-appverif iisexpress.exe
+    foreach ($element in $exes) {
+        Setup-appverif $element
+    }
 
     Setup-Dumps;
 }
 
 if ($Mode -eq "SetupDumps")
 {
-    Shutdown-appverif w3wp.exe
-    Shutdown-appverif iisexpress.exe
+    foreach ($element in $exes) {
+        Shutdown-appverif $element
+    }
 
     Setup-Dumps;
 }
 
 if ($Mode -eq "Shutdown")
 {
-    Shutdown-appverif w3wp.exe
-    Shutdown-appverif iisexpress.exe
+    foreach ($element in $exes) {
+        Shutdown-appverif $element
+    }
 
     Shutdown-Dumps;
 }

src/Servers/IIS/tools/SetupTestEnvironment.ps1 renamed to .azure/pipelines/tools/SetupTestEnvironment.ps1

@@ -1,6 +1,14 @@
 ; EditorConfig to support per-solution formatting.
 ; Use the EditorConfig VS add-in to make this work.
 ; http://editorconfig.org/
+;
+; Here are some resources for what's supported for .NET/C#
+; https://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
+; https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference?view=vs-2017
+;
+; Be **careful** editing this because some of the rules don't support adding a severity level
+; For instance if you change to `dotnet_sort_system_directives_first = true:warning` (adding `:warning`)
+; then the rule will be silently ignored.
 
 ; This is the default for the codeline.
 root = true
@@ -13,7 +21,7 @@ insert_final_newline = true
 
 [*.cs]
 indent_size = 4
-dotnet_sort_system_directives_first = true:warning
+dotnet_sort_system_directives_first = true
 
 [*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}]
 indent_size = 2

.editorconfig

@@ -1,16 +1,22 @@
 # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
 # See https://help.github.com/articles/about-code-owners/
 
-/.azure/ @dougbu
-/.config/ @dougbu
-/build/ @dougbu
-/eng/ @dougbu
-/src/Components/ @SteveSandersonMS
-/src/DefaultBuilder/ @tratcher
-/src/Hosting/ @tratcher
-/src/Http/ @tratcher @jkotalik
-/src/Middleware/ @tratcher
-/src/Security/ @tratcher
-/src/Servers/ @tratcher @jkotalik
-/src/Middleware/Rewrite @jkotalik
-/src/Middleware/HttpsPolicy @jkotalik
+/global.json                    @aspnet/build
+/.azure/                        @aspnet/build
+/.config/                       @aspnet/build
+/build/                         @aspnet/build
+/eng/                           @aspnet/build
+/eng/common/                    @dotnet-maestro-bot
+/eng/Versions.props             @dotnet-maestro-bot @dougbu
+/eng/Version.Details.xml        @dotnet-maestro-bot @dougbu
+/src/Components/                @SteveSandersonMS
+/src/DefaultBuilder/            @tratcher @anurse
+/src/Hosting/                   @tratcher @anurse
+/src/Http/                      @tratcher @jkotalik @anurse
+/src/Middleware/                @tratcher @anurse
+/src/ProjectTemplates/          @ryanbrandenburg
+/src/Security/                  @tratcher @anurse
+/src/Servers/                   @tratcher @jkotalik @anurse @halter73
+/src/Middleware/Rewrite         @jkotalik @anurse
+/src/Middleware/HttpsPolicy     @jkotalik @anurse
+/src/SignalR/                   @mikaelm12 @BrennanConroy @halter73 @anurse