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

# Conflicts:
#	src/SignalR/clients/ts/FunctionalTests/yarn.lock
#	src/SignalR/clients/ts/signalr/src/NodeHttpClient.ts
#	src/SignalR/clients/ts/signalr/tests/HttpConnection.test.ts
#	src/SignalR/clients/ts/signalr/tests/TestWebSocket.ts

Author: Tratcher

.azure/pipelines/benchmarks.yml

@@ -12,7 +12,7 @@ jobs:
     jobName: Windows_Build
     jobDisplayName: "Build only : Windows"
     agentOs: Windows
-    buildArgs: -ci -all -pack
+    buildArgs: -all -pack
     artifacts:
     - path: artifacts/
       includeForks: true

.azure/pipelines/ci.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: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.components.x64.binlog
+        displayName: Build x64
+        workingDirectory: ./src/Components
+      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: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.servers.x64.binlog
+        displayName: Build x64
+        workingDirectory: ./src/Servers
+      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: ./build.cmd
+                -ci
+                -arch x64
+                /bl:artifacts/log/build.projectTemplates.x64.binlog
+        displayName: Build x64
+        workingDirectory: ./src/ProjectTemplates
+      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/devBuilds.yml

@@ -28,14 +28,6 @@ jobs:
         contents: '**/*.nupkg'
         targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/
         flattenFolders: true
-    - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-      - task: PowerShell@2
-        displayName: Setup Private Feeds Credentials
-        inputs:
-          filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-          arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
-        env:
-          Token: $(dn-bot-dnceng-artifact-feeds-rw)
     - powershell: .\eng\common\build.ps1
         -ci
         -restore

.azure/pipelines/helix-test.yml

@@ -59,6 +59,7 @@ parameters:
   installNodeJs: true
   installJdk: true
   timeoutInMinutes: 180
+  useHostedUbuntu: true
 
   # 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
@@ -81,7 +82,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
@@ -91,20 +92,23 @@ jobs:
       ${{ if eq(parameters.agentOs, 'macOS') }}:
         vmImage: macOS-10.14
       ${{ if eq(parameters.agentOs, 'Linux') }}:
-        vmImage: ubuntu-16.04
+        ${{ if eq(parameters.useHostedUbuntu, true) }}:
+          vmImage: ubuntu-16.04
+        ${{ if eq(parameters.useHostedUbuntu, false) }}:
+          ${{ if eq(variables['System.TeamProject'], 'public') }}:
+            name: NetCorePublic-Pool
+            queue: BuildPool.Ubuntu.1604.Amd64.Open
+          ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+            name: NetCoreInternal-Pool
+            queue: BuildPool.Ubuntu.1604.Amd64
       ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: NetCorePublic-Pool
-          ${{ if ne(parameters.isTestingJob, true) }}:
-            # Visual Studio Build Tools
-            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.Server.Amd64.VS2019.Open
+          queue: BuildPool.Windows.10.Amd64.VS2019.Pre.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.Server.Amd64.VS2019
+          queue: BuildPool.Windows.10.Amd64.VS2019.Pre
     variables:
     - AgentOsName: ${{ parameters.agentOs }}
     - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@@ -113,6 +117,7 @@ jobs:
     - _BuildConfig: ${{ parameters.configuration }}
     - BuildConfiguration: ${{ parameters.configuration }}
     - BuildDirectory: ${{ parameters.buildDirectory }}
+    - DOTNET_CLI_HOME: $(Agent.BuildDirectory)
     - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     - TeamName: AspNetCore
     - ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
@@ -125,6 +130,9 @@ jobs:
       - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
         - _SignType: test
     steps:
+    - ${{ if ne(parameters.agentOs, 'Windows') }}:
+      - script: df -h
+        displayName: Disk size
     - checkout: self
       clean: true
     - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
@@ -138,6 +146,7 @@ jobs:
         inputs:
           versionSpec: 10.x
     - ${{ if eq(parameters.agentOs, 'Windows') }}:
+      - task: NuGetToolInstaller@1
       - task: NuGetCommand@2
         displayName: 'Clear NuGet caches'
         condition: succeeded()
@@ -158,40 +167,48 @@ jobs:
 
     - ${{ parameters.beforeBuild }}
 
-    - ${{ if ne(parameters.steps, '')}}:
-      - ${{ parameters.steps }}
-    - ${{ if eq(parameters.steps, '')}}:
-      - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-        - ${{ if eq(parameters.agentOs, 'Windows') }}:
-          - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            - task: PowerShell@2
-              displayName: Setup Private Feeds Credentials
-              inputs:
-                filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
-                arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
-              env:
-                Token: $(dn-bot-dnceng-artifact-feeds-rw)
-        - ${{ if ne(parameters.agentOs, 'Windows') }}:
-          - task: Bash@3
+    - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+      - ${{ if eq(parameters.agentOs, 'Windows') }}:
+        - ${{ if ne(variables['System.TeamProject'], 'public') }}:
+          - task: PowerShell@2
             displayName: Setup Private Feeds Credentials
             inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-              arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
+              arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
             env:
               Token: $(dn-bot-dnceng-artifact-feeds-rw)
+      - ${{ if ne(parameters.agentOs, 'Windows') }}:
+        - task: Bash@3
+          displayName: Setup Private Feeds Credentials
+          inputs:
+            filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
+            arguments: $(Build.SourcesDirectory)/NuGet.config $Token
+          env:
+            Token: $(dn-bot-dnceng-artifact-feeds-rw)
+
+    - ${{ if ne(parameters.steps, '')}}:
+      - ${{ parameters.steps }}
+    - ${{ if eq(parameters.steps, '')}}:
       - ${{ if eq(parameters.buildScript, '') }}:
         - ${{ if eq(parameters.agentOs, 'Windows') }}:
-          - script: .\$(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: .\$(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
             displayName: Run build.cmd
         - ${{ if ne(parameters.agentOs, 'Windows') }}:
-          - script: ./$(BuildDirectory)/build.sh -ci -configuration $(BuildConfiguration) $(BuildScriptArgs)
+          - script: ./$(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
             displayName: Run build.sh
       - ${{ if ne(parameters.buildScript, '') }}:
-        - script: $(BuildScript) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
+        - script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
           displayName: run $(BuildScript)
 
     - ${{ parameters.afterBuild }}
 
+    - ${{ if eq(parameters.agentOs, 'Linux') }}:
+      - script: df -h && du -h --threshold=50MB ..
+        displayName: Disk utilization
+    - ${{ if eq(parameters.agentOs, 'macOS') }}:
+      - script: df -h && du -h -d 3 ..
+        displayName: Disk utilization
+
     - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
       - powershell: ./eng/scripts/FinishDumpCollectionForHangingBuilds.ps1 artifacts/dumps/
         displayName: Finish background dump collection
@@ -251,6 +268,7 @@ jobs:
         condition: always()
         inputs:
           testRunner: junit
-          testResultsFiles: '**/TEST-com.microsoft.signalr*.xml'
+          testResultsFiles: '**/TEST-junit-jupiter.xml'
           buildConfiguration: $(BuildConfiguration)
           buildPlatform: $(AgentOsName)
+          mergeTestResults: true

.azure/pipelines/jobs/codesign-xplat.yml

@@ -0,0 +1,46 @@
+# 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_quarantine_x64
+    jobDisplayName: 'Tests: Helix Quarantine x64'
+    agentOs: Windows
+    timeoutInMinutes: 240
+    steps:
+    # Build the shared framework
+    - script: ./build.cmd -ci -all -pack -arch x64 /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 interop projects
+    - script: .\build.cmd -ci -NoRestore -test -noBuildJava -all -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 -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

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

@@ -20,6 +20,10 @@
     {
       "placeholder": "1qaz@WSX",
       "_justification": "This is a fake password used in test code."
+    },
+    {
+      "file": "\\src\\Servers\\Kestrel\\shared\\test\\TestCertificates\\testCert.pfx",
+      "_justification": "Legitimate UT certificate file with private key"
     }
   ]
 }

.azure/pipelines/quarantined-tests.yml

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-serve": {
+      "version": "1.5.0",
+      "commands": [
+        "dotnet-serve"
+      ]
+    }
+  }
+}