diff --git a/Directory.Build.props b/Directory.Build.props
index 650a9d7340..272280dc60 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -86,7 +86,7 @@
aspnetcore-targeting-pack
- false
+ false
-
- 2.2.0
+
+
+ 3.0.0
+
+
+
+ 3.0.0
+
+
- 2.2.0
+ 3.0.0
-
-
- 2.2.0
-
-
-
- 2.2.0
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
- 2.2.0-preview-35687
+ 3.0.0
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.7
-
-
-
-
- 2.2.7
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.0
+ 3.0.0
-
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
+
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
+
- 2.2.0
+ 3.0.0
-
-
-
+
- 2.2.2
+ 3.0.0
-
-
-
+
- 2.2.0
+ 3.0.0
-
-
-
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
- 2.2.0
+
+
+
+ 3.0.0
-
-
-
+
+
- 2.2.0
+ 3.0.0
-
-
-
+
+
- 2.2.0
+ 3.0.0
-
-
-
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
+
+
+
+
+
-
-
+
+
+
- 2.2.5
+ 3.0.0
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+ 3.0.0
+
+
+
- 2.2.5
+ 3.0.0
-
-
-
+
+
+
+
+
+ 3.0.0-preview9.19465.2
+
+
+
+
+
+
+
+
+ 3.0.0-preview9.19465.2
+
+
+
+
+
+
+ 3.0.0-preview9.19465.2
+
+
+
+ 3.0.0-preview9.19465.2
+
+
+
+
+
+
+ 3.0.0-preview9.19465.2
+
+
+
+
+
+
+
+
+
+ 3.0.0-preview9.19465.2
+
+
+
+ 3.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3.0.0
+
+
+
+ 3.0.0
+
+
+
+
+
+
+
+
+
+
+
+ 3.0.0
+
+
+
+
+
+
+
+
+
+
+ 3.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3.0.0
+
+
+
+
- 2.2.0
+ 3.0.0
+
+
+
+
-
-
+
+
+
-
-
- 2.2.0
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
- 2.2.0
+ 3.0.0
-
+
-
+
+
+
+
+ 3.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 2.2.0
+ 3.0.0
- 2.2.0
+ 3.0.0
-
+
- 2.2.7
+ 3.0.0
-
+
+
-
- 2.2.0
+ 3.0.0
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
+
+
+
+
-
-
+
+
- 2.2.5
+ 3.0.0
-
+
-
-
- 2.2.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
- 2.2.1
+ 3.0.0
-
-
-
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
-
-
-
-
- 2.2.7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.0
-
-
-
-
+
+
- 1.1.0
+ 3.0.0
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- 1.1.0
+ 3.0.0
+
+
+
-
-
-
-
-
-
- 1.1.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
+
+
- 2.2.0
+ 3.0.0
+
+
+
+
-
-
-
-
- 2.2.2
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
+
+
+
+
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- 2.2.5
+ 3.0.0
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
+
+
+
+
- 2.2.0
+ 3.0.0
-
-
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
+
- 2.2.0
+ 3.0.0
-
-
-
-
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
+
+
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
- 2.2.6
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.5
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
+
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
-
-
- 2.2.0
-
-
-
-
- 2.2.0
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
- 2.2.2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.6
-
-
-
-
-
-
-
-
-
-
- 2.2.6
-
-
-
-
-
-
-
-
-
-
- 2.2.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
+
- 2.2.0
+ 3.0.0
-
-
+
+
-
-
-
-
-
-
- 2.2.1
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
-
-
-
- 1.1.0
-
-
-
-
-
-
-
+
+
- 1.1.0
+ 3.0.0
-
-
+
+
+
+
+
+ 3.0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 1.1.0
+ 3.0.0
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
- 1.1.0
-
-
-
-
-
-
-
-
-
+
+
+
- 1.1.0
+ 3.0.0
+
+
+
-
-
+
- 1.1.5
+ 3.0.0
+
-
-
-
- 1.1.5
+
+
+ 3.0.0
-
-
-
-
-
+
+
+
- 1.1.0
+ 3.0.0
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- 1.1.5
+ 3.0.0
-
+
-
-
+
-
-
- 1.1.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
- 2.2.7
+ 3.0.0
-
-
-
-
+
+
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
-
-
-
+
+
-
-
- 2.2.1
+
+
+ 3.0.0
-
-
-
-
-
-
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
-
- 2.2.0
+
+
+ 3.0.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
+
+
+ 3.0.0
+
+
+
+ 3.0.0
+
+
+
+ 3.0.0
+
+
+
+ 3.0.0
-
-
-
-
-
-
-
-
-
-
-
- 2.2.0
+ 3.0.0
-
-
-
-
+
+
+
+
- 2.2.0
+ 3.0.0
+
+
+
+
+
-
-
-
-
+
+
+
- 2.2.0
+ 3.0.0
+
+
+
+
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
-
-
- 2.2.0
-
-
-
-
-
- 2.2.0
-
-
-
-
+
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index b541b834a2..52cbb358f4 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -1,138 +1,91 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 2c26521f8c..c139969aa4 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -4,8 +4,8 @@ This file contains a list of the package IDs which are patching in a given relea
CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky.
When adding a new package, make sure the new line ends with a semicolon and starts with a space.
-Later on, this will be checked using this condition:
+Directory.Build.props checks this property using the following condition:
$(PackagesInPatch.Contains(' $(PackageId);'))
-->
@@ -15,59 +15,7 @@ Later on, this will be checked using this condition:
-
-
-
-
- @aspnet/signalr;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
- Microsoft.AspNetCore.Authentication.Google;
- Microsoft.AspNetCore.Http;
- Microsoft.AspNetCore.Mvc.Core;
- Microsoft.AspNetCore.Routing;
- Microsoft.AspNetCore.Server.IIS;
- java:signalr;
-
-
-
-
- @aspnet/signalr;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
-
-
-
-
- Microsoft.AspNetCore.AspNetCoreModule;
- Microsoft.AspNetCore.AspNetCoreModuleV2;
- Microsoft.AspNetCore.Identity.UI;
- java:signalr;
- Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
- Microsoft.AspNetCore.SignalR.Redis;
- Microsoft.AspNetCore.SignalR.StackExchangeRedis;
- Microsoft.AspNetCore.DataProtection.StackExchangeRedis;
- Microsoft.AspNetCore.Mvc.Core;
- Microsoft.AspNetCore.Mvc.RazorPages;
- Microsoft.AspNetCore.AzureAppServicesIntegration;
- Microsoft.AspNetCore.AzureAppServices.HostingStartup;
- Microsoft.AspNetCore.AzureAppServices.SiteExtension;
-
-
-
-
- Microsoft.AspNetCore.Mvc.Api.Analyzers;
- Microsoft.AspNetCore.Server.HttpSys;
- Microsoft.AspNetCore.Server.IIS;
-
-
-
-
- Microsoft.AspNetCore.DataProtection.AzureStorage;
- Microsoft.AspNetCore.Hosting;
- Microsoft.AspNetCore.SpaServices;
-
-
-
-
+ Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
diff --git a/eng/Versions.props b/eng/Versions.props
index 762d6c4f60..c80d51925b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,8 +22,15 @@
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)
false
+
+ true
- true
+ true
$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)
$(VersionPrefix)
diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets
index 263edf3eaa..4efbe58e97 100644
--- a/eng/targets/ResolveReferences.targets
+++ b/eng/targets/ResolveReferences.targets
@@ -36,7 +36,8 @@
-->
true
true
- true
+ true
false
- true
+ true
true
false
@@ -122,7 +123,7 @@
Text="Cannot reference "%(_InvalidReferenceToNonSharedFxAssembly.Identity)". This dependency is not in the shared framework. See docs/SharedFramework.md for instructions on how to modify what is in the shared framework." />
-
+
diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
index 082a9eaf02..df9cc7220a 100644
--- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj
+++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
@@ -3,7 +3,7 @@
Exe
$(DefaultNetCoreTargetFramework)
- -s https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
+ -s https://api.nuget.org/v3/index.json
$(MSBuildThisFileDirectory)../../
diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
index 68d1e48c8e..4c0a31a3f6 100644
--- a/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
+++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
@@ -23,6 +23,14 @@
+
+
+
+
+
+
+
+