* Undo overzealous merge choices
* Undo temporary changes applied when part of the repo was building in the blazor-wasm branch
* Skip SPA template tests in 3.1
This pull request updates the following dependencies
[marker]: <> (Begin:e908e90a-0c22-4c54-b254-08d79557a113)
## From https://github.com/dotnet/efcore
- **Subscription**: e908e90a-0c22-4c54-b254-08d79557a113
- **Build**: 20200520.1
- **Date Produced**: 5/20/2020 5:36 PM
- **Commit**: 85b57af827aa71b77d673e813e046d081c8027ed
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
- **Microsoft.EntityFrameworkCore.Tools**: from 3.1.4 to 3.1.5
- **Microsoft.EntityFrameworkCore.InMemory**: from 3.1.4 to 3.1.5
- **Microsoft.EntityFrameworkCore**: from 3.1.4 to 3.1.5
- **Microsoft.EntityFrameworkCore.Relational**: from 3.1.4 to 3.1.5
- **Microsoft.EntityFrameworkCore.Sqlite**: from 3.1.4 to 3.1.5
- **dotnet-ef**: from 3.1.4 to 3.1.5
- **Microsoft.EntityFrameworkCore.SqlServer**: from 3.1.4 to 3.1.5
[marker]: <> (End:e908e90a-0c22-4c54-b254-08d79557a113)
This pull request updates the following dependencies
[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200520.13
- **Date Produced**: 5/21/2020 3:42 AM
- **Commit**: 0e01666509ce785750e66cb5e2d2da219867c4fb
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
- **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.5 to 3.1.5
- **Microsoft.AspNetCore.Razor.Language**: from 3.1.5 to 3.1.5
- **Microsoft.CodeAnalysis.Razor**: from 3.1.5 to 3.1.5
- **Microsoft.NET.Sdk.Razor**: from 3.1.5 to 3.1.5
[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
This pull request updates the following dependencies
[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200520.4
- **Date Produced**: 5/20/2020 7:15 PM
- **Commit**: 7b992cb8b4ec55b2b3888db28d7ab105eeaaa5f7
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
- **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.5
- **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.5
- **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.5
- **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.5
[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
* Improve build reliability
- ensure `ResolveCustomReferences` target executes before packages are used
- `ResolveAssemblyReferences` and `ResolveAssemblyReferencesDesignTime` targets run too late
- e.g. failed builds of Microsoft.AspNetCore.WebUtilities or Microsoft.AspNetCore.Hosting when building from root
- add `GetReferenceProjectTargetPathMetadata` for ease of use as well as reliability
- avoids extra work to get existing metadata (ref/ projects execute no tasks in this target)
nit: rename `@(ReferenceProjectMetadata)` -> `@(ReferenceProjectTargetPathMetadata)`
* Ensure `GetTargetPathMetadata` target runs with `$(TargetFramework)` set
- ref/ projects all multi-target and otherwise no-op this target
* Revert "Fix various "Type or namespace not found" errors (#20736)"
- change is no longer needed with other fixes in this PR
This reverts commit 8218d6e0e7.
This pull request updates the following dependencies
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
- **System.Net.Http.WinHttpHandler**: from 4.7.0 to 4.7.1 (parent: Microsoft.NETCore.App.Runtime.win-x64)
[marker]: <> (End:Coherency Updates)
[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200422.2
- **Date Produced**: 4/22/2020 7:47 PM
- **Commit**: a8242d79df31dbff528c185dd62c290b7cc262de
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
- **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.4
- **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.4
- **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.4
- **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.4
- **System.Net.Http.WinHttpHandler**: from 4.7.0 to 4.7.1
[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
This pull request updates the following dependencies
[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200415.2
- **Date Produced**: 4/15/2020 6:12 PM
- **Commit**: a49970f2f15efb27b91541bb4b94581693c92b8d
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
- **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.4 to 3.1.4
- **Microsoft.AspNetCore.Razor.Language**: from 3.1.4 to 3.1.4
- **Microsoft.CodeAnalysis.Razor**: from 3.1.4 to 3.1.4
- **Microsoft.NET.Sdk.Razor**: from 3.1.4 to 3.1.4
[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
This pull request updates the following dependencies
[marker]: <> (Begin:7bf32a0c-3505-43af-42b0-08d79559e63d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore-tooling
- **Subscription**: 7bf32a0c-3505-43af-42b0-08d79559e63d
- **Build**: 20200414.7
- **Date Produced**: 4/15/2020 5:37 AM
- **Commit**: 06ade7a064cbdcf80aa6457541c1a99b7e39b5a8
- **Branch**: refs/heads/internal/release/3.1
- **Updates**:
- **Microsoft.AspNetCore.Mvc.Razor.Extensions**: from 3.1.3 to 3.1.4
- **Microsoft.AspNetCore.Razor.Language**: from 3.1.3 to 3.1.4
- **Microsoft.CodeAnalysis.Razor**: from 3.1.3 to 3.1.4
- **Microsoft.NET.Sdk.Razor**: from 3.1.3 to 3.1.4
[marker]: <> (End:7bf32a0c-3505-43af-42b0-08d79559e63d)
[marker]: <> (Begin:Coherency Updates)
## Coherency Updates
The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)
- **Microsoft.AspNetCore.Analyzer.Testing**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.AspNetCore.BenchmarkRunner.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.ActivatorUtilities.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.CommandLineUtils.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.HashCodeCombiner.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.HostFactoryResolver.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.Logging.Testing**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.ParameterDefaultValue.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.TypeNameHelper.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.Extensions.ValueStopwatch.Sources**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.NETCore.App.Internal**: from 3.1.4-servicing.20181.2 to 3.1.4-servicing.20202.1 (parent: Microsoft.Extensions.Logging)
- **Internal.AspNetCore.Analyzers**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.20202.2 (parent: Microsoft.EntityFrameworkCore)
- **Microsoft.AspNetCore.Testing**: from 3.1.4-servicing.20181.5 to 3.1.4-servicing.202 ...