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

Author: dougbu

.azure/pipelines/ci.yml

@@ -83,6 +83,7 @@ stages:
       - name: Code_Check_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
 
   # Build Windows (x64/x86)
   - template: jobs/default-build.yml
@@ -163,10 +164,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 +207,7 @@ stages:
       - name: Windows_arm_Logs
         path: artifacts/log/
         publishOnError: true
+        includeForks: true
       - name: Windows_arm_Packages
         path: artifacts/packages/
 
@@ -220,6 +233,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 +294,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 +324,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 +354,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 +387,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 +420,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 +443,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 +478,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 +510,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 +547,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 +580,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

.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

Directory.Build.props

@@ -53,7 +53,7 @@
 
     <IncludeSymbols>true</IncludeSymbols>
 
-    <DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
+    <DefaultNetCoreTargetFramework>netcoreapp3.1</DefaultNetCoreTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

NuGet.config

@@ -2,14 +2,8 @@
 <configuration>
   <packageSources>
     <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-aspnet-Extensions-0b951c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-0b951c16/nuget/v3/index.json" />
-    <add key="darc-pub-aspnet-EntityFrameworkCore-b403b17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-EntityFrameworkCore-b403b17b/nuget/v3/index.json" />
-    <add key="darc-pub-aspnet-AspNetCore-Tooling-16b0ca4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-16b0ca4a/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-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />
     <add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
     <add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />

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
 

eng/Build.props

@@ -42,6 +42,7 @@
 
     <!-- Exclude the benchmarks because they use <PackageReference>. -->
     <ProjectToExclude Include="
+                      $(RepoRoot)src\Components\benchmarkapps\**\*.csproj;
                       $(RepoRoot)src\Mvc\benchmarkapps\**\*.csproj;
                       $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj;
                       $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;

eng/CodeGen.proj

@@ -85,4 +85,4 @@
           SkipNonexistentProjects="true" />
   </Target>
 
-</Project>
+</Project>

eng/ProjectReferences.props

@@ -15,6 +15,8 @@
     <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Tools\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj"  />
+    <ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj"  />
+    <ProjectReferenceProvider Include="BlazorServerApp" ProjectPath="$(RepoRoot)src\Components\Samples\BlazorServerApp\BlazorServerApp.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepoRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" RefProjectPath="$(RepoRoot)src\Features\JsonPatch\ref\Microsoft.AspNetCore.JsonPatch.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Abstractions\ref\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />

eng/PublishSymbols.proj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" DefaultTargets="RunPublishSymbols">
   <PropertyGroup>
     <!-- TFM doesn't matter. These settings are required to make NuGet happy so we can restore required MSBuild packages. -->
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <ManifestsPath>artifacts\manifests\</ManifestsPath>
     <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>

eng/SharedFramework.External.props

@@ -107,7 +107,7 @@
     These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
     is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
   -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' or $(TargetFrameworks.Contains('netcoreapp3.0'))">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' or $(TargetFrameworks.Contains('$(DefaultNetCoreTargetFramework)'))">
     <_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
     <_CompilationOnlyReference Include="System.Security.Cryptography.Cng" />
     <_CompilationOnlyReference Include="System.Security.Principal.Windows" />