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

- upgrade Arcade SDK to '1.0.0-beta.19607.3'
- regenerate eng/ProjectReferences.props and ref/ projects

.azure/pipelines/ci.yml

@@ -9,6 +9,7 @@ trigger:
     include:
     - master
     - release/*
+    - internal/release/3.*
 
 # Run PR validation on all branches
 pr:
@@ -65,7 +66,10 @@ variables:
       value: test
     - name: _PublishArgs
       value: ''
-
+  # 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
@@ -83,6 +87,7 @@ stages:
       - name: Code_Check_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
 
   # Build Windows (x64/x86)
   - template: jobs/default-build.yml
@@ -163,10 +168,21 @@ stages:
                 /p:PublishInstallerBaseVersion=true
         displayName: Build Installers
 
+      # A few files must also go to the VS package feed.
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+        - task: NuGetCommand@2
+          displayName: Push Visual Studio packages
+          inputs:
+            command: push
+            packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg'
+            nuGetFeedType: external
+            publishFeedCredentials: 'DevDiv - VS package feed'
+
       artifacts:
       - name: Windows_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Windows_Packages
         path: artifacts/packages/
 
@@ -195,6 +211,7 @@ stages:
       - name: Windows_arm_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Windows_arm_Packages
         path: artifacts/packages/
 
@@ -220,6 +237,7 @@ stages:
       - name: MacOS_x64_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: MacOS_x64_Packages
         path: artifacts/packages/
   - template: jobs/codesign-xplat.yml
@@ -280,6 +298,7 @@ stages:
       - name: Linux_x64_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Linux_x64_Packages
         path: artifacts/packages/
   - template: jobs/codesign-xplat.yml
@@ -309,6 +328,7 @@ stages:
       - name: Linux_arm_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Linux_arm_Packages
         path: artifacts/packages/
   - template: jobs/codesign-xplat.yml
@@ -338,6 +358,7 @@ stages:
       - name: Linux_arm64_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Linux_arm64_Packages
         path: artifacts/packages/
   - template: jobs/codesign-xplat.yml
@@ -370,6 +391,7 @@ stages:
       - name: Linux_musl_x64_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Linux_musl_x64_Packages
         path: artifacts/packages/
   - template: jobs/codesign-xplat.yml
@@ -402,6 +424,7 @@ stages:
       - name: Linux_musl_arm64_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Linux_musl_arm64_Packages
         path: artifacts/packages/
   - template: jobs/codesign-xplat.yml
@@ -424,13 +447,25 @@ stages:
       - powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunFlakyTests=true"
         displayName: Run Flaky Tests
         continueOnError: true
+      - task: PublishTestResults@2
+        displayName: Publish Flaky Test Results
+        inputs:
+          testResultsFormat: 'xUnit'
+          testResultsFiles: '*.xml'
+          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
       artifacts:
+      - name: Windows_Test_Dumps
+        path: artifacts/dumps/
+        publishOnError: true
+        includeForks: false
       - name: Windows_Test_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Windows_Test_Results
         path: artifacts/TestResults/
         publishOnError: true
+        includeForks: true
 
   - template: jobs/default-build.yml
     parameters:
@@ -447,12 +482,18 @@ stages:
       - script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
         displayName: Test Templates
       artifacts:
+      - name: Windows_Test_Templates_Dumps
+        path: artifacts/dumps/
+        publishOnError: true
+        includeForks: false
       - name: Windows_Test_Templates_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Windows_Test_Templates_Results
         path: artifacts/TestResults/
         publishOnError: true
+        includeForks: true
 
   - template: jobs/default-build.yml
     parameters:
@@ -473,13 +514,21 @@ stages:
       - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
         displayName: Run Flaky Tests
         continueOnError: true
+      - task: PublishTestResults@2
+        displayName: Publish Flaky Test Results
+        inputs:
+          testResultsFormat: 'xUnit'
+          testResultsFiles: '*.xml'
+          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
       artifacts:
       - name: MacOS_Test_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: MacOS_Test_Results
         path: artifacts/TestResults/
         publishOnError: true
+        includeForks: true
 
   - template: jobs/default-build.yml
     parameters:
@@ -502,13 +551,21 @@ stages:
       - bash: ./build.sh --no-build --ci --test -p:RunFlakyTests=true
         displayName: Run Flaky Tests
         continueOnError: true
+      - task: PublishTestResults@2
+        displayName: Publish Flaky Test Results
+        inputs:
+          testResultsFormat: 'xUnit'
+          testResultsFiles: '*.xml'
+          searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
       artifacts:
       - name: Linux_Test_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Linux_Test_Results
         path: artifacts/TestResults/
         publishOnError: true
+        includeForks: true
 
   # Source build
   - job: Source_Build
@@ -527,17 +584,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.0.100
-        installationPath: $(DotNetCoreSdkDir)
-        includePreviewVersions: true
     - script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
       displayName: Run ci-source-build.sh
     - task: PublishBuildArtifacts@1
@@ -591,3 +637,18 @@ stages:
       # See https://github.com/dotnet/arcade/issues/2871
       enableSymbolValidation: false
       publishInstallersAndChecksums: true
+      # This is to enable SDL runs part of Post-Build Validation Stage
+      SDLValidationParameters:
+        enable: true
+        continueOnError: false
+        params: ' -SourceToolsList @("policheck","credscan")
+        -TsaInstanceURL $(_TsaInstanceURL)
+        -TsaProjectName $(_TsaProjectName)
+        -TsaNotificationEmail $(_TsaNotificationEmail)
+        -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
+        -TsaBugAreaPath $(_TsaBugAreaPath)
+        -TsaIterationPath $(_TsaIterationPath)
+        -TsaRepositoryName "AspNetCore"
+        -TsaCodebaseName "AspNetCore"
+        -TsaPublish $True
+        -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/PoliCheckExclusions.xml")'

.azure/pipelines/helix-test.yml

@@ -25,23 +25,3 @@ jobs:
     - 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/jobs/codesign-xplat.yml

@@ -44,5 +44,6 @@ jobs:
     - name: CodeSign_Xplat_${{ parameters.inputName }}_Logs
       path: artifacts/log/
       publishOnError: true
+      includeForks: true
     - name: ${{ parameters.inputName }}_Packages_Signed
       path: artifacts/packages/

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

@@ -127,6 +127,11 @@ jobs:
     steps:
     - checkout: self
       clean: true
+    - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
+      - powershell: ./eng/scripts/InstallProcDump.ps1
+        displayName: Install ProcDump
+      - powershell: ./eng/scripts/StartDumpCollectionForHangingBuilds.ps1 $(ProcDumpPath)procdump.exe artifacts/dumps/ (Get-Date).AddMinutes(160) dotnet
+        displayName: Start background dump collection
     - ${{ if eq(parameters.installNodeJs, 'true') }}:
       - task: NodeTool@0
         displayName: Install Node 10.x
@@ -169,6 +174,12 @@ jobs:
 
     - ${{ parameters.afterBuild }}
 
+    - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isTestingJob, true)) }}:
+      - powershell: ./eng/scripts/FinishDumpCollectionForHangingBuilds.ps1 artifacts/dumps/
+        displayName: Finish background dump collection
+        continueOnError: true
+        condition: always()
+
     - ${{ if eq(parameters.agentOs, 'Windows') }}:
       - powershell: eng\scripts\KillProcesses.ps1
         displayName: Kill processes

.github/CODEOWNERS

@@ -19,4 +19,4 @@
 /src/Servers/                   @tratcher @jkotalik @anurse @halter73
 /src/Middleware/Rewrite         @jkotalik @anurse
 /src/Middleware/HttpsPolicy     @jkotalik @anurse
-/src/SignalR/                   @mikaelm12 @BrennanConroy @halter73 @anurse
+/src/SignalR/                   @BrennanConroy @halter73 @anurse

Directory.Build.props

@@ -51,7 +51,7 @@
 
     <IncludeSymbols>true</IncludeSymbols>
 
-    <DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
+    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
   </PropertyGroup>
 
   <!-- Warnings and errors -->

NuGet.config

@@ -4,12 +4,13 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
-    <add key="dotnet3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3/nuget/v3/index.json" />
-    <add key="dotnet3-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3-transport/nuget/v3/index.json" />
+    <add key="dotnet3.1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1/nuget/v3/index.json" />
+    <add key="dotnet3.1-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
     <add key="grpc-nuget-dev" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>

docs/BuildFromSource.md

@@ -27,6 +27,7 @@ Building ASP.NET Core on Windows requires:
         ```ps1
         PS> ./eng/scripts/InstallJdk.ps1
         ```
+* Chrome - Selenium-based tests require a version of Chrome to be installed. Download and install it from [https://www.google.com/chrome]
 
 ### macOS/Linux