From 9a35bbea03a60da142b3d8541cf0abeea62efbdf Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 22 Mar 2019 17:33:20 -0700
Subject: [PATCH] Experience for Razor SDK (#8731)

* Experience for Razor SDK

* Remove Components.Build
* Update MVC projects and templates to use AddRazorSupportForMvc
* Update components templates to use .razor extension

Fixes https://github.com/aspnet/AspNetCore/issues/6392

* Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190321.3

- Microsoft.NET.Sdk.Razor - 3.0.0-preview4.19171.3
- Microsoft.CodeAnalysis.Razor - 3.0.0-preview4.19171.3
- Microsoft.AspNetCore.Razor.Language - 3.0.0-preview4.19171.3
- Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview4.19171.3

* Update dependencies from https://github.com/dotnet/core-setup build 20190322.01

- Microsoft.NETCore.App - 3.0.0-preview4-27522-01

Dependency coherency updates

- Microsoft.Bcl.Json.Sources - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- Microsoft.CSharp - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- Microsoft.Win32.Registry - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.ComponentModel.Annotations - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Data.SqlClient - 4.7.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Diagnostics.EventLog - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.IO.Pipelines - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Net.Http.WinHttpHandler - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Net.WebSockets.WebSocketProtocol - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Reflection.Metadata - 1.7.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Runtime.CompilerServices.Unsafe - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Cng - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Pkcs - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Xml - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Security.Principal.Windows - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.ServiceProcess.ServiceController - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Text.Encodings.Web - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- System.Threading.Channels - 4.6.0-preview4.19164.7 (parent: Microsoft.NETCore.App)
- Microsoft.Extensions.DependencyModel - 3.0.0-preview4-27522-01 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.Platforms - 3.0.0-preview4.19164.7 (parent: Microsoft.NETCore.App)

* Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190321.4

- Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview4.19171.4
- Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview4.19171.4
- dotnet-ef - 3.0.0-preview4.19171.4
- Microsoft.EntityFrameworkCore - 3.0.0-preview4.19171.4
- Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview4.19171.4
- Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview4.19171.4
- Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview4.19171.4

* Update dependencies from https://github.com/aspnet/Extensions build 20190321.4

- Mono.WebAssembly.Interop - 3.0.0-preview4.19171.4
- Microsoft.JSInterop - 3.0.0-preview4.19171.4
- Microsoft.Internal.Extensions.Refs - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview4.19171.4
- Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview4.19171.4
- Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.DependencyInjection - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.Xml - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.Json - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.Ini - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview4.19171.4
- Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration - 3.0.0-preview4.19171.4
- Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Caching.Memory - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview4.19171.4
- Microsoft.AspNetCore.Testing - 3.0.0-preview4.19171.4
- Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview4.19171.4
- Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview4.19171.4
- Internal.AspNetCore.Analyzers - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Configuration.Binder - 3.0.0-preview4.19171.4
- Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview4.19171.4
- Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview4.19171.4
- Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview4.19171.4
- Microsoft.Extensions.WebEncoders - 3.0.0-preview4.19171.4
- Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview4.19171.4
- Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Primitives - 3.0.0-preview4.19171.4
- Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Options - 3.0.0-preview4.19171.4
- Microsoft.Extensions.ObjectPool - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.Testing - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.EventSource - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.Debug - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.Console - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.Configuration - 3.0.0-preview4.19171.4
- Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview4.19171.4
- Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview4.19171.4
- Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Hosting - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Http - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Localization - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview4.19171.4
- Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview4.19171.4

* Grab latest from other aspnet repos
- brings everything into coherence
- aspnet/Extensions packages with version 3.0.0-preview4.19172.1 from build 20190322.1
- aspnet/AspNetCore-Tooling packages with version 3.0.0-preview4.19172.2 from build 20190322.2
- aspnet/EntityFrameworkCore packages with version 3.0.0-preview4.19172.3 from build 20190322.3
---
 eng/ProjectReferences.props                   |   1 -
 eng/Version.Details.xml                       | 372 +++++++++---------
 eng/Versions.props                            | 186 ++++-----
 ...spNetCore.Authentication.AzureAD.UI.csproj |   5 +-
 ...etCore.Authentication.AzureADB2C.UI.csproj |   5 +-
 .../AzureADB2CSample/AzureADB2CSample.csproj  |   5 +-
 .../AzureADSample/AzureADSample.csproj        |   1 +
 .../Microsoft.AspNetCore.Blazor.Build.nuspec  |   1 -
 .../Build/src/ReferenceFromSource.props       |   2 -
 .../Build/test/BindRazorIntegrationTest.cs    |  25 +-
 .../test/ChildContentRazorIntegrationTest.cs  |  14 +-
 .../ComponentRenderingRazorIntegrationTest.cs |  14 -
 .../GenericComponentRazorIntegrationTest.cs   |   7 -
 .../BlazorLibrary-CSharp.csproj               |   1 -
 .../{Home.cshtml => Home.razor}               |   0
 .../HostedInAspNet.Client.csproj              |   1 +
 .../HostedInAspNet.Server.csproj              |   3 -
 .../Views/_ViewImports.cshtml                 |   0
 .../{App.cshtml => App.razor}                 |   0
 ...ft.AspNetCore.Blazor.E2EPerformance.csproj |   1 +
 .../Pages/{Index.cshtml => Index.razor}       |   0
 .../Pages/{Json.cshtml => Json.razor}         |   0
 .../{RenderList.cshtml => RenderList.razor}   |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 .../{MainLayout.cshtml => MainLayout.razor}   |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 .../MonoSanityClient/MonoSanityClient.csproj  |   1 +
 .../StandaloneApp/{App.cshtml => App.razor}   |   0
 .../Pages/{Counter.cshtml => Counter.razor}   |   0
 .../{FetchData.cshtml => FetchData.razor}     |   0
 .../Pages/{Index.cshtml => Index.razor}       |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 .../{MainLayout.cshtml => MainLayout.razor}   |   0
 .../Shared/{NavMenu.cshtml => NavMenu.razor}  |   0
 .../StandaloneApp/StandaloneApp.csproj        |   1 +
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 ...crosoft.AspNetCore.Components.Build.csproj |  10 -
 ...pNetCore.Components.Build.netcoreapp3.0.cs |   3 -
 ...crosoft.AspNetCore.Components.Build.csproj |  25 --
 ...crosoft.AspNetCore.Components.Build.nuspec |  24 --
 .../Build/src/ReferenceFromSource.props       |  16 -
 ...icrosoft.AspNetCore.Components.Build.props |   3 -
 ...rosoft.AspNetCore.Components.Build.targets |   3 -
 src/Components/Build/src/targets/All.props    |   2 -
 src/Components/Build/src/targets/All.targets  |   5 -
 .../src/targets/RazorCompilation.targets      |  29 --
 src/Components/Components.sln                 |  17 -
 .../test/E2ETest/Tests/EventTest.cs           |   3 +-
 ....cshtml => AddRemoveChildComponents.razor} |   0
 ...html => AfterRenderInteropComponent.razor} |   0
 ...shtml => AsyncEventHandlerComponent.razor} |   0
 .../BasicTestApp/BasicTestApp.csproj          |   1 +
 ...ponent.cshtml => BindCasesComponent.razor} |   0
 ...shtml => CascadingValueIntermediary.razor} |   0
 ...html => CascadingValueReceiveByName.razor} |   0
 ...html => CascadingValueReceiveByType.razor} |   0
 ...scadingValueReceiveFixedByInterface.razor} |   0
 ...er.cshtml => CascadingValueSupplier.razor} |   0
 ...ent.cshtml => ComponentRefComponent.razor} |   0
 ...ild.cshtml => ConcurrentRenderChild.razor} |   0
 ...nt.cshtml => ConcurrentRenderParent.razor} |   0
 ...omponent.cshtml => CounterComponent.razor} |   0
 ...shtml => CounterComponentUsingChild.razor} |   0
 ...r.cshtml => CounterComponentWrapper.razor} |   0
 ...mponent.cshtml => DataDashComponent.razor} |   0
 ...nent.cshtml => DispatchingComponent.razor} |   0
 ...onent.cshtml => ElementRefComponent.razor} |   0
 ...nt.cshtml => EventBubblingComponent.razor} |   0
 ...Component.cshtml => ButtonComponent.razor} |   0
 ...kCases.cshtml => EventCallbackCases.razor} |   0
 .../{InnerButton.cshtml => InnerButton.razor} |   0
 ...MiddleButton.cshtml => MiddleButton.razor} |   0
 ...utton.cshtml => StronglyTypedButton.razor} |   0
 ...dControl.cshtml => TemplatedControl.razor} |   0
 ...tml => EventPreventDefaultComponent.razor} |   0
 ...ge.cshtml => ExternalContentPackage.razor} |   1 -
 ...onent.cshtml => FocusEventComponent.razor} |   0
 ...yPropertyChangedValidationComponent.razor} |   0
 ...cshtml => SimpleValidationComponent.razor} |   0
 ...shtml => TypicalValidationComponent.razor} |   0
 ...rts.cshtml => ComponentUsingImports.razor} |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 ...ent.cshtml => HtmlBlockChildContent.razor} |   0
 ...t.cshtml => HtmlEncodedChildContent.razor} |   0
 ...ent.cshtml => HtmlMixedChildContent.razor} |   0
 ...html => BinaryHttpRequestsComponent.razor} |   0
 ...nt.cshtml => CookieCounterComponent.razor} |   0
 ...ent.cshtml => HttpRequestsComponent.razor} |   0
 .../{Index.cshtml => Index.razor}             |   0
 ...onent.cshtml => InputEventComponent.razor} |   0
 ...omponent.cshtml => InteropComponent.razor} |   0
 ...nt.cshtml => KeyPressEventComponent.razor} |   0
 ...tml => LogicalElementInsertionCases.razor} |   0
 ...nent.cshtml => MarkupBlockComponent.razor} |   0
 ...omponent.cshtml => MessageComponent.razor} |   0
 ...onent.cshtml => MouseEventComponent.razor} |   0
 ...tent.cshtml => MultipleChildContent.razor} |   0
 .../{OrderedList.cshtml => OrderedList.razor} |   0
 ...nent.cshtml => ParentChildComponent.razor} |   0
 ...html => PassThroughContentComponent.razor} |   0
 ...ml => PropertiesChangedHandlerChild.razor} |   0
 ...l => PropertiesChangedHandlerParent.razor} |   3 +-
 ...rTemplates.cshtml => RazorTemplates.razor} |   0
 ...omponent.cshtml => RedTextComponent.razor} |   0
 ...ler.cshtml => RenderFragmentToggler.razor} |   0
 .../{Default.cshtml => Default.razor}         |   0
 .../{Error404.cshtml => Error404.razor}       |   0
 .../RouterTest/{Links.cshtml => Links.razor}  |   0
 .../RouterTest/{Other.cshtml => Other.razor}  |   0
 .../BasicTestApp/RouterTest/TestRouter.cshtml |   1 -
 .../BasicTestApp/RouterTest/TestRouter.razor  |   2 +
 ...ters.cshtml => WithNumberParameters.razor} |   0
 ...Parameters.cshtml => WithParameters.razor} |   0
 ...ponent.cshtml => SvgCircleComponent.razor} |   0
 ...SvgComponent.cshtml => SvgComponent.razor} |   0
 ...ent.cshtml => SvgWithChildComponent.razor} |   0
 ...latedTable.cshtml => TemplatedTable.razor} |   0
 ...mponent.cshtml => TextOnlyComponent.razor} |   0
 ...onent.cshtml => TouchEventComponent.razor} |   0
 .../{App.cshtml => App.razor}                 |   0
 .../ComponentsApp.App.csproj                  |   4 +-
 .../Pages/{Counter.cshtml => Counter.razor}   |   0
 .../{FetchData.cshtml => FetchData.razor}     |   0
 .../Pages/{Index.cshtml => Index.razor}       |   0
 .../Pages/{Ticker.cshtml => Ticker.razor}     |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 .../{MainLayout.cshtml => MainLayout.razor}   |   0
 .../Shared/{NavMenu.cshtml => NavMenu.razor}  |   0
 .../{_ViewImports.cshtml => _Imports.razor}   |   0
 .../ComponentsApp.Server.csproj               |   4 +-
 ...kage.cshtml => ComponentFromPackage.razor} |   0
 .../TestContentPackage.csproj                 |   4 +-
 .../ApiAuthSample/ApiAuthSample.csproj        |   1 +
 .../Microsoft.AspNetCore.Identity.UI.csproj   |   4 +-
 .../IdentitySample.DefaultUI.csproj           |   1 +
 .../IdentitySample.Mvc.csproj                 |   1 +
 .../Identity.DefaultUI.WebSite.csproj         |   1 +
 .../NodeServicesExamples.csproj               |   1 +
 .../samples/Webpack/Webpack.csproj            |   1 +
 .../samples/MusicStore/MusicStore.csproj      |   1 +
 .../BasicViews/BasicViews.csproj              |   1 +
 .../RazorRendering/RazorRendering.csproj      |   1 +
 ...ft.AspNetCore.Mvc.Performance.Views.csproj |   1 +
 .../Components/Pages/_ViewImports.cshtml      |   2 -
 .../MvcSandbox/Components/_ViewImports.cshtml |   1 -
 src/Mvc/samples/MvcSandbox/MvcSandbox.csproj  |   2 +-
 .../ApplicationModelWebSite.csproj            |   1 +
 .../WebSites/BasicWebSite/BasicWebSite.csproj |   1 +
 .../RazorComponents/RouterContainer.razor     |   5 +-
 .../ControllersFromServicesWebSite.csproj     |   1 +
 .../ErrorPageMiddlewareWebSite.csproj         |   1 +
 .../HtmlGenerationWebSite.csproj              |   1 +
 .../RazorPagesClassLibrary.csproj             |   5 +-
 .../RazorPagesWebSite.csproj                  |   1 +
 .../WebSites/RazorWebSite/RazorWebSite.csproj |   1 +
 .../RoutingWebSite/RoutingWebSite.csproj      |   1 +
 .../SecurityWebSite/SecurityWebSite.csproj    |   1 +
 .../TagHelpersWebSite.csproj                  |   1 +
 ...crosoft.DotNet.Web.ProjectTemplates.csproj |   1 -
 .../RazorClassLibrary-CSharp.csproj.in        |   2 +-
 .../RazorComponentsWeb-CSharp.csproj.in       |   2 +-
 .../RazorPagesWeb-CSharp.csproj.in            |   1 +
 .../StarterWeb-CSharp.csproj.in               |   1 +
 .../Angular-CSharp.csproj.in                  |   1 +
 .../React-CSharp.csproj.in                    |   1 +
 .../ReactRedux-CSharp.csproj.in               |   1 +
 .../ClaimsTransformation.csproj               |   1 +
 src/Security/samples/Cookies/Cookies.csproj   |   1 +
 .../CustomPolicyProvider.csproj               |   1 +
 .../DynamicSchemes/DynamicSchemes.csproj      |   1 +
 .../Identity.ExternalClaims.csproj            |   1 +
 .../PathSchemeSelection.csproj                |   1 +
 .../StaticFilesAuth/StaticFilesAuth.csproj    |   1 +
 .../Common.FunctionalTests/AppOfflineTests.cs |   5 +-
 .../ConfigurationChangeTests.cs               |   3 +-
 .../Inprocess/StartupTests.cs                 |   3 +-
 .../test/IIS.Tests/ClientDisconnectTests.cs   |   7 +-
 178 files changed, 352 insertions(+), 528 deletions(-)
 rename src/Components/Blazor/testassets/HostedInAspNet.Client/{Home.cshtml => Home.razor} (100%)
 delete mode 100644 src/Components/Blazor/testassets/HostedInAspNet.Server/Views/_ViewImports.cshtml
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/{App.cshtml => App.razor} (100%)
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/{Index.cshtml => Index.razor} (100%)
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/{Json.cshtml => Json.razor} (100%)
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/{RenderList.cshtml => RenderList.razor} (100%)
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/{MainLayout.cshtml => MainLayout.razor} (100%)
 rename src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/{App.cshtml => App.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/Pages/{Counter.cshtml => Counter.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/Pages/{FetchData.cshtml => FetchData.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/Pages/{Index.cshtml => Index.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/Pages/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/Shared/{MainLayout.cshtml => MainLayout.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/Shared/{NavMenu.cshtml => NavMenu.razor} (100%)
 rename src/Components/Blazor/testassets/StandaloneApp/{_ViewImports.cshtml => _Imports.razor} (100%)
 delete mode 100644 src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.csproj
 delete mode 100644 src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.netcoreapp3.0.cs
 delete mode 100644 src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj
 delete mode 100644 src/Components/Build/src/Microsoft.AspNetCore.Components.Build.nuspec
 delete mode 100644 src/Components/Build/src/ReferenceFromSource.props
 delete mode 100644 src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.props
 delete mode 100644 src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.targets
 delete mode 100644 src/Components/Build/src/targets/All.props
 delete mode 100644 src/Components/Build/src/targets/All.targets
 delete mode 100644 src/Components/Build/src/targets/RazorCompilation.targets
 rename src/Components/test/testassets/BasicTestApp/{AddRemoveChildComponents.cshtml => AddRemoveChildComponents.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{AfterRenderInteropComponent.cshtml => AfterRenderInteropComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{AsyncEventHandlerComponent.cshtml => AsyncEventHandlerComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{BindCasesComponent.cshtml => BindCasesComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/CascadingValueTest/{CascadingValueIntermediary.cshtml => CascadingValueIntermediary.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/CascadingValueTest/{CascadingValueReceiveByName.cshtml => CascadingValueReceiveByName.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/CascadingValueTest/{CascadingValueReceiveByType.cshtml => CascadingValueReceiveByType.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/CascadingValueTest/{CascadingValueReceiveFixedByInterface.cshtml => CascadingValueReceiveFixedByInterface.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/CascadingValueTest/{CascadingValueSupplier.cshtml => CascadingValueSupplier.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{ComponentRefComponent.cshtml => ComponentRefComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{ConcurrentRenderChild.cshtml => ConcurrentRenderChild.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{ConcurrentRenderParent.cshtml => ConcurrentRenderParent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{CounterComponent.cshtml => CounterComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{CounterComponentUsingChild.cshtml => CounterComponentUsingChild.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{CounterComponentWrapper.cshtml => CounterComponentWrapper.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{DataDashComponent.cshtml => DataDashComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{DispatchingComponent.cshtml => DispatchingComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{ElementRefComponent.cshtml => ElementRefComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{EventBubblingComponent.cshtml => EventBubblingComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/EventCallbackTest/{ButtonComponent.cshtml => ButtonComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/EventCallbackTest/{EventCallbackCases.cshtml => EventCallbackCases.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/EventCallbackTest/{InnerButton.cshtml => InnerButton.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/EventCallbackTest/{MiddleButton.cshtml => MiddleButton.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/EventCallbackTest/{StronglyTypedButton.cshtml => StronglyTypedButton.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/EventCallbackTest/{TemplatedControl.cshtml => TemplatedControl.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{EventPreventDefaultComponent.cshtml => EventPreventDefaultComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{ExternalContentPackage.cshtml => ExternalContentPackage.razor} (96%)
 rename src/Components/test/testassets/BasicTestApp/{FocusEventComponent.cshtml => FocusEventComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/FormsTest/{NotifyPropertyChangedValidationComponent.cshtml => NotifyPropertyChangedValidationComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/FormsTest/{SimpleValidationComponent.cshtml => SimpleValidationComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/FormsTest/{TypicalValidationComponent.cshtml => TypicalValidationComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/{ComponentUsingImports.cshtml => ComponentUsingImports.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{HtmlBlockChildContent.cshtml => HtmlBlockChildContent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{HtmlEncodedChildContent.cshtml => HtmlEncodedChildContent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{HtmlMixedChildContent.cshtml => HtmlMixedChildContent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/HttpClientTest/{BinaryHttpRequestsComponent.cshtml => BinaryHttpRequestsComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/HttpClientTest/{CookieCounterComponent.cshtml => CookieCounterComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/HttpClientTest/{HttpRequestsComponent.cshtml => HttpRequestsComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{Index.cshtml => Index.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{InputEventComponent.cshtml => InputEventComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{InteropComponent.cshtml => InteropComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{KeyPressEventComponent.cshtml => KeyPressEventComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{LogicalElementInsertionCases.cshtml => LogicalElementInsertionCases.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{MarkupBlockComponent.cshtml => MarkupBlockComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{MessageComponent.cshtml => MessageComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{MouseEventComponent.cshtml => MouseEventComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{MultipleChildContent.cshtml => MultipleChildContent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{OrderedList.cshtml => OrderedList.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{ParentChildComponent.cshtml => ParentChildComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{PassThroughContentComponent.cshtml => PassThroughContentComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{PropertiesChangedHandlerChild.cshtml => PropertiesChangedHandlerChild.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{PropertiesChangedHandlerParent.cshtml => PropertiesChangedHandlerParent.razor} (53%)
 rename src/Components/test/testassets/BasicTestApp/{RazorTemplates.cshtml => RazorTemplates.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{RedTextComponent.cshtml => RedTextComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{RenderFragmentToggler.cshtml => RenderFragmentToggler.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/RouterTest/{Default.cshtml => Default.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/RouterTest/{Error404.cshtml => Error404.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/RouterTest/{Links.cshtml => Links.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/RouterTest/{Other.cshtml => Other.razor} (100%)
 delete mode 100644 src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.cshtml
 create mode 100644 src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor
 rename src/Components/test/testassets/BasicTestApp/RouterTest/{WithNumberParameters.cshtml => WithNumberParameters.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/RouterTest/{WithParameters.cshtml => WithParameters.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{SvgCircleComponent.cshtml => SvgCircleComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{SvgComponent.cshtml => SvgComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{SvgWithChildComponent.cshtml => SvgWithChildComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{TemplatedTable.cshtml => TemplatedTable.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{TextOnlyComponent.cshtml => TextOnlyComponent.razor} (100%)
 rename src/Components/test/testassets/BasicTestApp/{TouchEventComponent.cshtml => TouchEventComponent.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/{App.cshtml => App.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Pages/{Counter.cshtml => Counter.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Pages/{FetchData.cshtml => FetchData.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Pages/{Index.cshtml => Index.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Pages/{Ticker.cshtml => Ticker.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Pages/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Shared/{MainLayout.cshtml => MainLayout.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/Shared/{NavMenu.cshtml => NavMenu.razor} (100%)
 rename src/Components/test/testassets/ComponentsApp.App/{_ViewImports.cshtml => _Imports.razor} (100%)
 rename src/Components/test/testassets/TestContentPackage/{ComponentFromPackage.cshtml => ComponentFromPackage.razor} (100%)
 delete mode 100644 src/Mvc/samples/MvcSandbox/Components/Pages/_ViewImports.cshtml
 delete mode 100644 src/Mvc/samples/MvcSandbox/Components/_ViewImports.cshtml

diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
index 1c6c55fd85..56e3e873c2 100644
--- a/eng/ProjectReferences.props
+++ b/eng/ProjectReferences.props
@@ -127,7 +127,6 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor" ProjectPath="$(RepositoryRoot)src\Components\Blazor\Blazor\src\Microsoft.AspNetCore.Blazor.csproj" RefProjectPath="$(RepositoryRoot)src\Components\Blazor\Blazor\ref\Microsoft.AspNetCore.Blazor.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepositoryRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj" RefProjectPath="$(RepositoryRoot)src\Components\Blazor\Server\ref\Microsoft.AspNetCore.Blazor.Server.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Browser" ProjectPath="$(RepositoryRoot)src\Components\Browser\src\Microsoft.AspNetCore.Components.Browser.csproj" RefProjectPath="$(RepositoryRoot)src\Components\Browser\ref\Microsoft.AspNetCore.Components.Browser.csproj" />
-    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Build" ProjectPath="$(RepositoryRoot)src\Components\Build\src\Microsoft.AspNetCore.Components.Build.csproj" RefProjectPath="$(RepositoryRoot)src\Components\Build\ref\Microsoft.AspNetCore.Components.Build.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepositoryRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" RefProjectPath="$(RepositoryRoot)src\Components\Components\ref\Microsoft.AspNetCore.Components.csproj" />
   </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a604c84a29..0edbed23ae 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,384 +9,384 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>25fe68e2bc95d69154be35e96219cc978241f146</Sha>
+      <Sha>0000</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>25fe68e2bc95d69154be35e96219cc978241f146</Sha>
+      <Sha>0000</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>25fe68e2bc95d69154be35e96219cc978241f146</Sha>
+      <Sha>0000</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>25fe68e2bc95d69154be35e96219cc978241f146</Sha>
+      <Sha>0000</Sha>
     </Dependency>
-    <Dependency Name="dotnet-ef" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="dotnet-ef" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-preview4.19168.3">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-preview4.19172.3">
       <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
-      <Sha>058e2cdc206b3c68c4066ac471bcfb0edc172f4e</Sha>
+      <Sha>c37190139b6f0001be887dcf440cc6cd4b9cff71</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.ActivatorUtilities.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Caching.SqlServer" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.AzureKeyVault" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.KeyPerFile" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.DiagnosticAdapter" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.HashCodeCombiner.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Http" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Localization.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Localization" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Localization" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.AzureAppServices" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging.Testing" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Options" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.TypeNameHelper.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.ValueStopwatch.Sources" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Extensions.WebEncoders" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.Internal.Extensions.Refs" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.JSInterop" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Mono.WebAssembly.Interop" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Mono.WebAssembly.Interop" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Bcl.Json.Sources" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.Bcl.Json.Sources" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CSharp" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.CSharp" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.ComponentModel.Annotations" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Data.SqlClient" Version="4.7.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Data.SqlClient" Version="4.7.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Diagnostics.EventLog" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.IO.Pipelines" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="1.7.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Reflection.Metadata" Version="1.7.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Security.Principal.Windows" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Text.Encodings.Web" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="4.6.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="System.Threading.Channels" Version="4.6.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview4-27518-02" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="3.0.0-preview4-27522-01" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>1f7bafc74db2973436e7dfd85dc8392bca4cdcfe</Sha>
+      <Sha>b58bfb6da1e5d538f8f2e8a80184943378a5dd9f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27518-02">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27522-01">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>1f7bafc74db2973436e7dfd85dc8392bca4cdcfe</Sha>
+      <Sha>b58bfb6da1e5d538f8f2e8a80184943378a5dd9f</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview4.19163.10" CoherentParentDependency="Microsoft.NETCore.App">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview4.19164.7" CoherentParentDependency="Microsoft.NETCore.App">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>689e58ec123d8c730d48d1c35c8f7ecbba6c22cf</Sha>
+      <Sha>d6a30736858f91b297fdd3ed4e3d1dfde67bdbdb</Sha>
     </Dependency>
-    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Internal.AspNetCore.Analyzers" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19121.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>660f6cd006b276edb3764f4d7d726cedf6c29d8e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview4.19168.1">
+    <Dependency Name="Microsoft.AspNetCore.Testing" Version="3.0.0-preview4.19172.1">
       <Uri>https://github.com/aspnet/Extensions</Uri>
-      <Sha>4b314dd3ce296dc1f951b91623ed070bccdaa918</Sha>
+      <Sha>398b67f8802f697cf5b3957b20766ddd9cb8fbdd</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index f18e4fa7ad..a1566047b2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,104 +19,104 @@
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19121.5</MicrosoftDotNetGenAPIPackageVersion>
     <!-- Packages from dotnet/core-setup -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview4-27518-02</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27518-02</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview4-27522-01</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27522-01</MicrosoftNETCoreAppPackageVersion>
     <!-- Packages from dotnet/corefx -->
-    <MicrosoftBclJsonSourcesPackageVersion>4.6.0-preview4.19163.10</MicrosoftBclJsonSourcesPackageVersion>
-    <MicrosoftCSharpPackageVersion>4.6.0-preview4.19163.10</MicrosoftCSharpPackageVersion>
-    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview4.19163.10</MicrosoftWin32RegistryPackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview4.19163.10</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDataSqlClientPackageVersion>4.7.0-preview4.19163.10</SystemDataSqlClientPackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview4.19163.10</SystemDiagnosticsEventLogPackageVersion>
-    <SystemIOPipelinesPackageVersion>4.6.0-preview4.19163.10</SystemIOPipelinesPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>4.6.0-preview4.19163.10</SystemNetHttpWinHttpHandlerPackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview4.19163.10</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <SystemReflectionMetadataPackageVersion>1.7.0-preview4.19163.10</SystemReflectionMetadataPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview4.19163.10</SystemRuntimeCompilerServicesUnsafePackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview4.19163.10</SystemSecurityCryptographyCngPackageVersion>
-    <SystemSecurityCryptographyPkcsPackageVersion>4.6.0-preview4.19163.10</SystemSecurityCryptographyPkcsPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview4.19163.10</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>4.6.0-preview4.19163.10</SystemSecurityPermissionsPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview4.19163.10</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview4.19163.10</SystemServiceProcessServiceControllerPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>4.6.0-preview4.19163.10</SystemTextEncodingsWebPackageVersion>
-    <SystemThreadingChannelsPackageVersion>4.6.0-preview4.19163.10</SystemThreadingChannelsPackageVersion>
+    <MicrosoftBclJsonSourcesPackageVersion>4.6.0-preview4.19164.7</MicrosoftBclJsonSourcesPackageVersion>
+    <MicrosoftCSharpPackageVersion>4.6.0-preview4.19164.7</MicrosoftCSharpPackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview4.19164.7</MicrosoftWin32RegistryPackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>4.6.0-preview4.19164.7</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDataSqlClientPackageVersion>4.7.0-preview4.19164.7</SystemDataSqlClientPackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>4.6.0-preview4.19164.7</SystemDiagnosticsEventLogPackageVersion>
+    <SystemIOPipelinesPackageVersion>4.6.0-preview4.19164.7</SystemIOPipelinesPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>4.6.0-preview4.19164.7</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.6.0-preview4.19164.7</SystemNetWebSocketsWebSocketProtocolPackageVersion>
+    <SystemReflectionMetadataPackageVersion>1.7.0-preview4.19164.7</SystemReflectionMetadataPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.6.0-preview4.19164.7</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview4.19164.7</SystemSecurityCryptographyCngPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>4.6.0-preview4.19164.7</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>4.6.0-preview4.19164.7</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>4.6.0-preview4.19164.7</SystemSecurityPermissionsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>4.6.0-preview4.19164.7</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>4.6.0-preview4.19164.7</SystemServiceProcessServiceControllerPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>4.6.0-preview4.19164.7</SystemTextEncodingsWebPackageVersion>
+    <SystemThreadingChannelsPackageVersion>4.6.0-preview4.19164.7</SystemThreadingChannelsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview4.19163.10</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview4.19164.7</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from aspnet/Extensions -->
-    <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview4.19168.1</InternalAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview4.19168.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
-    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview4.19168.1</MicrosoftAspNetCoreTestingPackageVersion>
-    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
-    <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
-    <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
-    <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationIniPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
-    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
-    <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
-    <MicrosoftExtensionsHostingPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsHostingPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsHttpPackageVersion>
-    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
-    <MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLocalizationPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingTestingPackageVersion>
-    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
-    <MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsObjectPoolPackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
-    <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
-    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
-    <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview4.19168.1</MicrosoftExtensionsWebEncodersPackageVersion>
-    <MicrosoftInternalExtensionsRefsPackageVersion>3.0.0-preview4.19168.1</MicrosoftInternalExtensionsRefsPackageVersion>
-    <MicrosoftJSInteropPackageVersion>3.0.0-preview4.19168.1</MicrosoftJSInteropPackageVersion>
-    <MonoWebAssemblyInteropPackageVersion>3.0.0-preview4.19168.1</MonoWebAssemblyInteropPackageVersion>
+    <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview4.19172.1</InternalAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview4.19172.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
+    <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview4.19172.1</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
+    <MicrosoftExtensionsCachingAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsCachingSqlServerPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsCachingSqlServerPackageVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsCachingStackExchangeRedisPackageVersion>
+    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationAzureKeyVaultPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationKeyPerFilePackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDiagnosticAdapterPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsDiagnosticAdapterPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsPackageVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsDiagnosticsHealthChecksPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
+    <MicrosoftExtensionsHostingAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsLocalizationAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLocalizationAbstractionsPackageVersion>
+    <MicrosoftExtensionsLocalizationPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLocalizationPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingAzureAppServicesPackageVersion>
+    <MicrosoftExtensionsLoggingConfigurationPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingEventSourcePackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingTestingPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingTestingPackageVersion>
+    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
+    <MicrosoftExtensionsObjectPoolPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsObjectPoolPackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsParameterDefaultValueSourcesPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsTypeNameHelperSourcesPackageVersion>
+    <MicrosoftExtensionsValueStopwatchSourcesPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsValueStopwatchSourcesPackageVersion>
+    <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview4.19172.1</MicrosoftExtensionsWebEncodersPackageVersion>
+    <MicrosoftInternalExtensionsRefsPackageVersion>3.0.0-preview4.19172.1</MicrosoftInternalExtensionsRefsPackageVersion>
+    <MicrosoftJSInteropPackageVersion>3.0.0-preview4.19172.1</MicrosoftJSInteropPackageVersion>
+    <MonoWebAssemblyInteropPackageVersion>3.0.0-preview4.19172.1</MonoWebAssemblyInteropPackageVersion>
     <!-- Packages from aspnet/EntityFrameworkCore -->
-    <dotnetefPackageVersion>3.0.0-preview4.19168.3</dotnetefPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview4.19168.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview4.19168.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview4.19168.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview4.19168.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview4.19168.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview4.19168.3</MicrosoftEntityFrameworkCorePackageVersion>
+    <dotnetefPackageVersion>3.0.0-preview4.19172.3</dotnetefPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview4.19172.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview4.19172.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview4.19172.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview4.19172.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview4.19172.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview4.19172.3</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Packages from aspnet/AspNetCore-Tooling -->
-    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview4.19168.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
-    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview4.19168.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
-    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.0-preview4.19168.1</MicrosoftCodeAnalysisRazorPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview4.19168.1</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview4.19172.3</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview4.19172.3</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftCodeAnalysisRazorPackageVersion>3.0.0-preview4.19172.3</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>3.0.0-preview4.19172.3</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
index d589f47d92..baf861cf3e 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj
@@ -8,10 +8,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsShippingPackage>true</IsShippingPackage>
     <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
-
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
index ae03d61920..cf3601f1ec 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj
@@ -8,10 +8,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsShippingPackage>true</IsShippingPackage>
     <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
-
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
index a7fccbdd3e..997ba1332a 100644
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
+++ b/src/Azure/AzureAD/samples/AzureADB2CSample/AzureADB2CSample.csproj
@@ -2,10 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <RazorCompileOnBuild>true</RazorCompileOnBuild>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj b/src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj
index dd2a2114ea..00382005e9 100644
--- a/src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj
+++ b/src/Azure/AzureAD/samples/AzureADSample/AzureADSample.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
index 3e85a96e10..4a217ffc24 100644
--- a/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
+++ b/src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
@@ -13,7 +13,6 @@
     <repository type="git" url="https://github.com/aspnet/aspnetcore" commit="$repositorycommit$" />
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <dependencies>
-      <dependency id="Microsoft.AspNetCore.Components.Build" version="$componentsversion$" include="all" />
       <dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
     </dependencies>
   </metadata>
diff --git a/src/Components/Blazor/Build/src/ReferenceFromSource.props b/src/Components/Blazor/Build/src/ReferenceFromSource.props
index 5802a69132..b178e32392 100644
--- a/src/Components/Blazor/Build/src/ReferenceFromSource.props
+++ b/src/Components/Blazor/Build/src/ReferenceFromSource.props
@@ -9,8 +9,6 @@
   This is only intended for use by other projects in this repo.
   -->
 
-  <Import Project="$(RepositoryRoot)src\Components\Build\src\ReferenceFromSource.props" />
-
   <PropertyGroup>
     <BlazorBuildReferenceFromSource>true</BlazorBuildReferenceFromSource>
     <BlazorJsPath>$(RepositoryRoot)src\Components\Browser.JS\src\dist\components.*.js</BlazorJsPath>
diff --git a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
index 1ef3c5df59..3a3da5aa17 100644
--- a/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/BindRazorIntegrationTest.cs
@@ -39,7 +39,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent bind-Value=""ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -77,7 +76,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent bind-Value=""ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -115,7 +113,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent bind-Value-OnChanged=""ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -153,7 +150,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent bind-Value-OnChanged=""ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -187,7 +183,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <div bind=""@ParentValue"" />
 @functions {
     public string ParentValue { get; set; } = ""hi"";
@@ -221,7 +216,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <div bind-value=""@ParentValue"" />
 @functions {
     public string ParentValue { get; set; } = ""hi"";
@@ -257,7 +251,6 @@ namespace Test
 
             // Act
             var result = CompileToCSharp(@"
-@addTagHelper *, TestAssembly
 <div bind-value=""@ParentValue"" />
 @functions {
     public string ParentValue { get; set; } = ""hi"";
@@ -265,7 +258,7 @@ namespace Test
 
             // Assert
             var diagnostic = Assert.Single(result.Diagnostics);
-            Assert.Equal("BL9989", diagnostic.Id);
+            Assert.Equal("RZ9989", diagnostic.Id);
             Assert.Equal(
                 "The attribute 'bind-value' was matched by multiple bind attributes. Duplicates:" + Environment.NewLine +
                 "Test.BindAttributes" + Environment.NewLine +
@@ -278,7 +271,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input bind=""@ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -300,7 +292,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind=""@CurrentDate"" format-value=""MM/dd/yyyy""/>
 @functions {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -323,7 +314,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind=""@CurrentDate"" format-value=""@Format""/>
 @functions {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -348,7 +338,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind=""@ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -371,7 +360,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""checkbox"" bind=""@Enabled"" />
 @functions {
     public bool Enabled { get; set; }
@@ -393,7 +381,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind-value-onchange=""@ParentValue"" />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -416,7 +403,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind-value-onchange=""@CurrentDate"" format-value=""MM/dd"" />
 @functions {
     public DateTime CurrentDate { get; set; } = new DateTime(2018, 1, 1);
@@ -439,7 +425,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input type=""@(""text"")"" bind-value-onchange=""@ParentValue"" visible />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -463,7 +448,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <input bind-value-onchange=""@ParentValue"" type=""text"" visible />
 @functions {
     public int ParentValue { get; set; } = 42;
@@ -490,7 +474,6 @@ namespace Test
         {
             // Arrange
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <div bind-value-onchange=""@ParentValue"">
   <span>@(42.ToString())</span>
 </div>
@@ -518,7 +501,6 @@ namespace Test
         {
             // Arrange & Act
             var generated = CompileToCSharp(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind-first-second-third=""Text"" />
 @functions {
     public string Text { get; set; } = ""text"";
@@ -526,7 +508,7 @@ namespace Test
 
             // Assert
             var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Equal("BL9991", diagnostic.Id);
+            Assert.Equal("RZ9991", diagnostic.Id);
         }
 
         [Fact]
@@ -534,7 +516,6 @@ namespace Test
         {
             // Arrange & Act
             var generated = CompileToCSharp(@"
-@addTagHelper *, TestAssembly
 <input type=""text"" bind-first-=""Text"" />
 @functions {
     public string Text { get; set; } = ""text"";
@@ -542,7 +523,7 @@ namespace Test
 
             // Assert
             var diagnostic = Assert.Single(generated.Diagnostics);
-            Assert.Equal("BL9991", diagnostic.Id);
+            Assert.Equal("RZ9991", diagnostic.Id);
         }
     }
 }
diff --git a/src/Components/Blazor/Build/test/ChildContentRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/ChildContentRazorIntegrationTest.cs
index 1b371c815a..0df512c076 100644
--- a/src/Components/Blazor/Build/test/ChildContentRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/ChildContentRazorIntegrationTest.cs
@@ -97,7 +97,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <RenderChildContent>
   <div></div>
 </RenderChildContent>");
@@ -120,7 +119,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentStringComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <RenderChildContentString Value=""HI"">
   <div>@context.ToLowerInvariant()</div>
 </RenderChildContentString>");
@@ -147,7 +145,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <RenderChildContent>
   <ChildContent>
     <div></div>
@@ -172,7 +169,7 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
+
 <RenderChildContent>
   <RenderChildContent>
     <div></div>
@@ -201,7 +198,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @{ RenderFragment<string> template = (context) => @<div>@context.ToLowerInvariant()</div>; }
 <RenderChildContent ChildContent=""@template(""HI"")"" />");
 
@@ -224,7 +220,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentStringComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @{ RenderFragment<string> template = (context) => @<div>@context.ToLowerInvariant()</div>; }
 <RenderChildContentString ChildContent=""@template"" Value=""HI"" />");
 
@@ -248,7 +243,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @{ RenderFragment template = @<div>@(""HI"".ToLowerInvariant())</div>; }
 <RenderChildContent ChildContent=""@template"" />");
 
@@ -271,7 +265,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @{ RenderFragment<string> template = (context) => @<div>@context.ToLowerInvariant()</div>; }
 <RenderChildContent ChildContent=""@template(""HI"")""></RenderChildContent>");
 
@@ -294,7 +287,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderChildContentComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @{ RenderFragment<string> template = (context) => @<div>@context.ToLowerInvariant()</div>; }
 <RenderChildContent ChildContent=""@template(""HI"")"">
 
@@ -319,7 +311,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderMultipleChildContent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @{ RenderFragment<string> header = context => @<div>@context.ToLowerInvariant()</div>; }
 <RenderMultipleChildContent Name=""billg"" Header=@header Value=""HI"">
   <ChildContent>Some @context.ToLowerInvariant() Content</ChildContent>
@@ -353,7 +344,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderMultipleChildContent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <RenderMultipleChildContent Name=""billg"" Value=""HI"" Context=""item"">
   <Header><div>@item.ToLowerInvariant()</div></Header>
   <ChildContent Context=""Context"">Some @Context.ToLowerInvariant() Content</ChildContent>
@@ -388,7 +378,7 @@ namespace Test
             AdditionalSyntaxTrees.Add(RenderMultipleChildContent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
+
 <RenderMultipleChildContent Name=""billg"" Value=""HI"" Context=""item"">
   <Header><div>@item.ToLowerInvariant()</div></Header>
   <ChildContent Context=""item"">Some @item.ToLowerInvariant() Content</ChildContent>
diff --git a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
index 2078a3e1df..b31811aa4b 100644
--- a/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs
@@ -36,7 +36,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent/>");
 
             // Act
@@ -72,7 +71,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent
     IntProperty=""123""
     BoolProperty=""true""
@@ -113,7 +111,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent  IntProperty=""123"" />");
 
             // Act
@@ -144,7 +141,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent StringProperty=""@(42.ToString())"" />");
 
             // Act
@@ -178,7 +174,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent some-attribute=""foo"" another-attribute=""@(42.ToString())"" />");
 
             // Act
@@ -219,7 +214,6 @@ namespace Test
 "));
 
             var component = CompileToComponent($@"
-@addTagHelper *, TestAssembly
 <MyComponent OnClick=""{expression}""/>
 
 @functions {{
@@ -265,7 +259,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent OnClick=""@Increment""/>
 
 @functions {
@@ -310,7 +303,6 @@ namespace Test
 }"));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent BoolProperty />");
 
             // Act
@@ -343,7 +335,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent MyAttr=""abc"">Some text<some-child a='1'>Nested text @(""Hello"")</some-child></MyComponent>");
 
             // Act
@@ -385,7 +376,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MyComponent><MyComponent>Some text</MyComponent></MyComponent>");
 
             // Act
@@ -432,7 +422,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 @page ""/""
 
 <SurveyPrompt Title=""<div>Test!</div>"" />
@@ -525,8 +514,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
-
 <html>
   <head><meta><meta></head>
   <body>
@@ -601,7 +588,6 @@ namespace Test
 "));
 
             var component = CompileToComponent(@"
-@addTagHelper ""*, TestAssembly""
 @{ RenderFragment<string> template = (context) => @<div>@context.ToLower()</div>; }
 <Repeater Count=3 Value=""Hello, World!"" Template=""template"" />
 ");
diff --git a/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs b/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs
index 7a8409e806..bad896c7b7 100644
--- a/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs
+++ b/src/Components/Blazor/Build/test/GenericComponentRazorIntegrationTest.cs
@@ -95,7 +95,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(GenericContextComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" />");
 
             // Act
@@ -122,7 +121,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(GenericContextComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"" ref=""_my"" />
 
 @functions {
@@ -155,7 +153,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(GenericContextComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <GenericContext TItem=int Items=""@(new List<int>() { 1, 2, })"">
   <div>@(context.Item * context.Index)</div>
 </GenericContext>");
@@ -191,7 +188,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(GenericContextComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <GenericContext Items=""@(new List<int>() { 1, 2, })"" ref=""_my"" />
 
 @functions {
@@ -224,7 +220,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(GenericContextComponent);
 
             var assembly = CompileToAssembly("Test.cshtml", @"
-@addTagHelper *, TestAssembly
 @typeparam TItem
 <GenericContext Items=""@MyItems"" ref=""_my"" />
 
@@ -263,7 +258,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(GenericContextComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <GenericContext Items=""@(new List<int>() { 1, 2, })"" />");
 
             // Act
@@ -290,7 +284,6 @@ namespace Test
             AdditionalSyntaxTrees.Add(MultipleGenericParameterComponent);
 
             var component = CompileToComponent(@"
-@addTagHelper *, TestAssembly
 <MultipleGenericParameter
   TItem1=""int""
   TItem2=""string""
diff --git a/src/Components/Blazor/Templates/src/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj b/src/Components/Blazor/Templates/src/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
index 8cbc0774a0..0abee02072 100644
--- a/src/Components/Blazor/Templates/src/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
+++ b/src/Components/Blazor/Templates/src/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
@@ -19,7 +19,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="$(TemplateComponentsPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="$(TemplateComponentsPackageVersion)" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Client/Home.cshtml b/src/Components/Blazor/testassets/HostedInAspNet.Client/Home.razor
similarity index 100%
rename from src/Components/Blazor/testassets/HostedInAspNet.Client/Home.cshtml
rename to src/Components/Blazor/testassets/HostedInAspNet.Client/Home.razor
diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
index 2b08bef060..954f5340f5 100644
--- a/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
+++ b/src/Components/Blazor/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj
index fcd9502fc4..6927153f36 100644
--- a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj
+++ b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj
@@ -10,9 +10,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Blazor.Server" />
-    <Reference Include="Microsoft.AspNetCore.Components.Server" />
-    <Reference Include="Microsoft.AspNetCore.Diagnostics" />
-    <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore" />
   </ItemGroup>
 
diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Server/Views/_ViewImports.cshtml b/src/Components/Blazor/testassets/HostedInAspNet.Server/Views/_ViewImports.cshtml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/App.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/App.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/App.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/App.razor
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj
index a488d15a57..9f796fdbcf 100644
--- a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj
+++ b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Microsoft.AspNetCore.Blazor.E2EPerformance.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Index.razor
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/Json.razor
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/RenderList.razor
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/_ViewImports.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/_Imports.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/_ViewImports.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Pages/_Imports.razor
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/Shared/MainLayout.razor
diff --git a/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_ViewImports.cshtml b/src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor
similarity index 100%
rename from src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_ViewImports.cshtml
rename to src/Components/Blazor/testassets/Microsoft.AspNetCore.Blazor.E2EPerformance/_Imports.razor
diff --git a/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj b/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj
index b1b28785f9..e40ea493bd 100644
--- a/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj
+++ b/src/Components/Blazor/testassets/MonoSanityClient/MonoSanityClient.csproj
@@ -5,6 +5,7 @@
     <IsPackable>false</IsPackable>
     <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
     <OutputType>exe</OutputType>
+    <RazorLangVersion>3.0</RazorLangVersion>
 
     <ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
     <!-- loader.js is hard-coded to assume it can load .pdbs regardless of Debug/Release configuration -->
diff --git a/src/Components/Blazor/testassets/StandaloneApp/App.cshtml b/src/Components/Blazor/testassets/StandaloneApp/App.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/App.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/App.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.cshtml b/src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/Pages/Counter.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.cshtml b/src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/Pages/FetchData.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/Index.cshtml b/src/Components/Blazor/testassets/StandaloneApp/Pages/Index.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/Pages/Index.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/Pages/Index.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Pages/_ViewImports.cshtml b/src/Components/Blazor/testassets/StandaloneApp/Pages/_Imports.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/Pages/_ViewImports.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/Pages/_Imports.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Shared/MainLayout.cshtml b/src/Components/Blazor/testassets/StandaloneApp/Shared/MainLayout.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/Shared/MainLayout.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/Shared/MainLayout.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.cshtml b/src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/Shared/NavMenu.razor
diff --git a/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj b/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj
index a488d15a57..9f796fdbcf 100644
--- a/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj
+++ b/src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/Blazor/testassets/StandaloneApp/_ViewImports.cshtml b/src/Components/Blazor/testassets/StandaloneApp/_Imports.razor
similarity index 100%
rename from src/Components/Blazor/testassets/StandaloneApp/_ViewImports.cshtml
rename to src/Components/Blazor/testassets/StandaloneApp/_Imports.razor
diff --git a/src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.csproj
deleted file mode 100644
index 78c493b13b..0000000000
--- a/src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.csproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- This file is automatically generated. -->
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Compile Include="Microsoft.AspNetCore.Components.Build.netcoreapp3.0.cs" />
-    
-  </ItemGroup>
-</Project>
diff --git a/src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.netcoreapp3.0.cs b/src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.netcoreapp3.0.cs
deleted file mode 100644
index 618082bc4a..0000000000
--- a/src/Components/Build/ref/Microsoft.AspNetCore.Components.Build.netcoreapp3.0.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
diff --git a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj
deleted file mode 100644
index baec1e15e3..0000000000
--- a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-    <Description>Build mechanism for ASP.NET Core components.</Description>
-    <OutputType>Library</OutputType>
-    <IsShippingPackage>true</IsShippingPackage>
-  </PropertyGroup>
-
-  <!-- Pack settings -->
-  <PropertyGroup>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <NuspecFile>Microsoft.AspNetCore.Components.Build.nuspec</NuspecFile>
-  </PropertyGroup>
-
-  <Target Name="PrepareNuspecProperties" BeforeTargets="_IntermediatePack">
-    <PropertyGroup>
-      <NuspecProperties>
-        version=$(PackageVersion);
-        repositorycommit=$(SourceRevisionId);
-      </NuspecProperties>
-    </PropertyGroup>
-  </Target>
-
-</Project>
diff --git a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.nuspec b/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.nuspec
deleted file mode 100644
index a726fa529c..0000000000
--- a/src/Components/Build/src/Microsoft.AspNetCore.Components.Build.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.AspNetCore.Components.Build</id>
-    <version>$version$</version>
-    <authors>Microsoft</authors>
-    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <description>Build mechanism for ASP.NET Core Components.</description>
-    <tags>aspnet components</tags>
-    <iconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
-    <licenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</licenseUrl>
-    <projectUrl>https://asp.net/</projectUrl>
-    <repository type="git" url="https://github.com/aspnet/aspnetcore" commit="$repositorycommit$" />
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <dependencies>
-      <dependency id="Microsoft.AspNetCore.Components.Analyzers" version="$version$" include="all" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\..\THIRD-PARTY-NOTICES.txt" />
-    <file src="build\**" target="build" />
-    <file src="targets\**" target="targets" />
-  </files>
-</package>
diff --git a/src/Components/Build/src/ReferenceFromSource.props b/src/Components/Build/src/ReferenceFromSource.props
deleted file mode 100644
index 020867ab20..0000000000
--- a/src/Components/Build/src/ReferenceFromSource.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project>
-
-  <!--
-  Importing this file is equivalent to having:
-    <PackageDependency Include="Microsoft.AspNetCore.Components.Build" />
-  ... except it's much more convenient when working in this repo, because it consumes the
-  Components.Build targets directly without needing this project to be packed into a .nupkg.
-
-  This is only intended for use by other projects in this repo.
-  -->
-
-  <Import Project="$(MSBuildThisFileDirectory)targets/All.props" />
-  <Import Project="$(MSBuildThisFileDirectory)targets/All.targets" />
-
-
-</Project>
diff --git a/src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.props b/src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.props
deleted file mode 100644
index 0407d95f86..0000000000
--- a/src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\All.props" />
-</Project>
\ No newline at end of file
diff --git a/src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.targets b/src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.targets
deleted file mode 100644
index 35115b33b3..0000000000
--- a/src/Components/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.Build.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\All.targets" />
-</Project>
diff --git a/src/Components/Build/src/targets/All.props b/src/Components/Build/src/targets/All.props
deleted file mode 100644
index 8c119d5413..0000000000
--- a/src/Components/Build/src/targets/All.props
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
diff --git a/src/Components/Build/src/targets/All.targets b/src/Components/Build/src/targets/All.targets
deleted file mode 100644
index a721c81953..0000000000
--- a/src/Components/Build/src/targets/All.targets
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-
-  <Import Project="RazorCompilation.targets" />
-
-</Project>
diff --git a/src/Components/Build/src/targets/RazorCompilation.targets b/src/Components/Build/src/targets/RazorCompilation.targets
deleted file mode 100644
index 87a84f9e57..0000000000
--- a/src/Components/Build/src/targets/RazorCompilation.targets
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project>
-  <!--
-    All of the core logic for components is now provided by the Razor SDK.
-
-    This file now contains some *very temporary* settings to make projects
-    that use components use similar defaults to 2.X-based Blazor projects.
-  -->
-  <PropertyGroup>
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
-    <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo>
-    <GenerateRazorHostingAssemblyInfo>false</GenerateRazorHostingAssemblyInfo>
-    <GenerateProvideApplicationPartFactoryAttribute>false</GenerateProvideApplicationPartFactoryAttribute>
-    <_RazorComponentInclude>**\*.cshtml</_RazorComponentInclude>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <RazorConfiguration Include="MVC-3.0" Condition="'$(DesignTimeBuild)'=='true'">
-      <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
-    </RazorConfiguration>
-    <RazorExtension Include="MVC-3.0" Condition="'$(DesignTimeBuild)'=='true'">
-      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
-      <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
-    </RazorExtension>
-    <ProjectCapability Include="DotNetCoreRazorConfiguration" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Components/Components.sln b/src/Components/Components.sln
index e798f22274..82940049d6 100644
--- a/src/Components/Components.sln
+++ b/src/Components/Components.sln
@@ -43,10 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Browser", "Browser", "{A27F
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser", "Browser\src\Microsoft.AspNetCore.Components.Browser.csproj", "{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2639736B-94BF-4A6C-AFAE-E9A44FF04CD0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Build", "Build\src\Microsoft.AspNetCore.Components.Build.csproj", "{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{3D9B9B2C-E379-41BD-83D4-2E099FBDA107}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Performance", "Components\perf\Microsoft.AspNetCore.Components.Performance.csproj", "{35A8AE1D-ED82-485E-A8E6-A357B3CB31B3}"
@@ -416,18 +412,6 @@ Global
 		{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E}.Release|x64.Build.0 = Release|Any CPU
 		{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E}.Release|x86.ActiveCfg = Release|Any CPU
 		{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E}.Release|x86.Build.0 = Release|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Debug|x64.Build.0 = Debug|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Debug|x86.Build.0 = Debug|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Release|x64.ActiveCfg = Release|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Release|x64.Build.0 = Release|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Release|x86.ActiveCfg = Release|Any CPU
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B}.Release|x86.Build.0 = Release|Any CPU
 		{35A8AE1D-ED82-485E-A8E6-A357B3CB31B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35A8AE1D-ED82-485E-A8E6-A357B3CB31B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35A8AE1D-ED82-485E-A8E6-A357B3CB31B3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1362,7 +1346,6 @@ Global
 		{1C4BF2D3-44A8-4A71-B031-15B983663CB0} = {A7ABAC29-F73F-456D-AE54-46842CFC2E10}
 		{C0FFB29E-4696-4875-9039-E5FA1AC5A42A} = {A7ABAC29-F73F-456D-AE54-46842CFC2E10}
 		{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E} = {A27FF193-195B-4474-8E6C-840B2E339373}
-		{74759A1D-159F-4B66-9FC1-7BE3F0DF2B2B} = {2639736B-94BF-4A6C-AFAE-E9A44FF04CD0}
 		{35A8AE1D-ED82-485E-A8E6-A357B3CB31B3} = {3D9B9B2C-E379-41BD-83D4-2E099FBDA107}
 		{8D49A92D-B4AA-4A5C-99C1-B4DCBD5491DD} = {3D9B9B2C-E379-41BD-83D4-2E099FBDA107}
 		{C987E45D-53AE-49EB-BD22-A15789B12F7F} = {3D9B9B2C-E379-41BD-83D4-2E099FBDA107}
diff --git a/src/Components/test/E2ETest/Tests/EventTest.cs b/src/Components/test/E2ETest/Tests/EventTest.cs
index da5a98af56..6787bf79d5 100644
--- a/src/Components/test/E2ETest/Tests/EventTest.cs
+++ b/src/Components/test/E2ETest/Tests/EventTest.cs
@@ -6,6 +6,7 @@ using BasicTestApp;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
@@ -134,7 +135,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
         }
 
         [Fact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1987")]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1987", FlakyOn.All)]
         public void InputEvent_RespondsOnKeystrokes()
         {
             MountTestComponent<InputEventComponent>();
diff --git a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.cshtml b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.cshtml
rename to src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
diff --git a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.cshtml b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.cshtml b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
index 5499fb368a..1892f71a39 100644
--- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
+++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
 
     <ReferenceBlazorBuildLocally>true</ReferenceBlazorBuildLocally>
     <!-- Must be defined before ReferenceFromSource.props is imported -->
diff --git a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.cshtml b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/BindCasesComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.cshtml b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.cshtml
rename to src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.cshtml b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.cshtml
rename to src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.cshtml b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.cshtml
rename to src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.cshtml b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.cshtml
rename to src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.cshtml b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.cshtml
rename to src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
diff --git a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.cshtml b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/ComponentRefComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.cshtml b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.cshtml
rename to src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.cshtml b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.cshtml
rename to src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponent.cshtml b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CounterComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/CounterComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.cshtml b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.cshtml
rename to src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponentWrapper.cshtml b/src/Components/test/testassets/BasicTestApp/CounterComponentWrapper.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/CounterComponentWrapper.cshtml
rename to src/Components/test/testassets/BasicTestApp/CounterComponentWrapper.razor
diff --git a/src/Components/test/testassets/BasicTestApp/DataDashComponent.cshtml b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/DataDashComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.cshtml b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/DispatchingComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.cshtml b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/ElementRefComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.cshtml b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventBubblingComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.cshtml b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.cshtml b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.cshtml b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.cshtml b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.cshtml b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.cshtml b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
diff --git a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.cshtml b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.cshtml b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
similarity index 96%
rename from src/Components/test/testassets/BasicTestApp/ExternalContentPackage.cshtml
rename to src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
index 5319bbc6f3..ef02e9f256 100644
--- a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.cshtml
+++ b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
@@ -1,4 +1,3 @@
-@addTagHelper *, TestContentPackage
 @using TestContentPackage
 @using Microsoft.JSInterop
 
diff --git a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.cshtml b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/FocusEventComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.cshtml b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.cshtml b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.cshtml b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/ComponentUsingImports.cshtml b/src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/ComponentUsingImports.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/ComponentUsingImports.cshtml
rename to src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/ComponentUsingImports.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/_ViewImports.cshtml b/src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/_Imports.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/_ViewImports.cshtml
rename to src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/Subdir/_Imports.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/_ViewImports.cshtml b/src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/_Imports.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/_ViewImports.cshtml
rename to src/Components/test/testassets/BasicTestApp/HierarchicalImportsTest/_Imports.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.cshtml b/src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.cshtml
rename to src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.cshtml b/src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.cshtml
rename to src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.cshtml b/src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.cshtml
rename to src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.cshtml b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.cshtml b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.cshtml b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/Index.cshtml b/src/Components/test/testassets/BasicTestApp/Index.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/Index.cshtml
rename to src/Components/test/testassets/BasicTestApp/Index.razor
diff --git a/src/Components/test/testassets/BasicTestApp/InputEventComponent.cshtml b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/InputEventComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.cshtml b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/InteropComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/InteropComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.cshtml b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/LogicalElementInsertionCases.cshtml b/src/Components/test/testassets/BasicTestApp/LogicalElementInsertionCases.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/LogicalElementInsertionCases.cshtml
rename to src/Components/test/testassets/BasicTestApp/LogicalElementInsertionCases.razor
diff --git a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.cshtml b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/MessageComponent.cshtml b/src/Components/test/testassets/BasicTestApp/MessageComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/MessageComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/MessageComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.cshtml b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/MouseEventComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.cshtml b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/MultipleChildContent.cshtml
rename to src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/OrderedList.cshtml b/src/Components/test/testassets/BasicTestApp/OrderedList.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/OrderedList.cshtml
rename to src/Components/test/testassets/BasicTestApp/OrderedList.razor
diff --git a/src/Components/test/testassets/BasicTestApp/ParentChildComponent.cshtml b/src/Components/test/testassets/BasicTestApp/ParentChildComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/ParentChildComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/ParentChildComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.cshtml b/src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/PassThroughContentComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.cshtml b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.cshtml
rename to src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerChild.razor
diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.cshtml b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
similarity index 53%
rename from src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.cshtml
rename to src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
index da7790a6d5..4fbdada071 100644
--- a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.cshtml
+++ b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
@@ -1,5 +1,4 @@
-@addTagHelper "*, BasicTestApp"
-<PropertiesChangedHandlerChild SuppliedValue=@valueToSupply />
+<PropertiesChangedHandlerChild SuppliedValue=@valueToSupply />
 <button onclick=@(x => valueToSupply++)>Increment</button>
 
 @functions {
diff --git a/src/Components/test/testassets/BasicTestApp/RazorTemplates.cshtml b/src/Components/test/testassets/BasicTestApp/RazorTemplates.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RazorTemplates.cshtml
rename to src/Components/test/testassets/BasicTestApp/RazorTemplates.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RedTextComponent.cshtml b/src/Components/test/testassets/BasicTestApp/RedTextComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RedTextComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/RedTextComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.cshtml b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.cshtml
rename to src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Default.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/Default.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RouterTest/Default.cshtml
rename to src/Components/test/testassets/BasicTestApp/RouterTest/Default.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Error404.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/Error404.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RouterTest/Error404.cshtml
rename to src/Components/test/testassets/BasicTestApp/RouterTest/Error404.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RouterTest/Links.cshtml
rename to src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Other.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/Other.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RouterTest/Other.cshtml
rename to src/Components/test/testassets/BasicTestApp/RouterTest/Other.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.cshtml
deleted file mode 100644
index fb0e962f09..0000000000
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-<Router AppAssembly=typeof(BasicTestApp.Program).Assembly FallbackComponent="typeof(Error404)" />
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor
new file mode 100644
index 0000000000..1cca82562c
--- /dev/null
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor
@@ -0,0 +1,2 @@
+@using Microsoft.AspNetCore.Components.Routing
+<Router AppAssembly=typeof(BasicTestApp.Program).Assembly FallbackComponent="typeof(Error404)" />
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.cshtml
rename to src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.cshtml b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.cshtml
rename to src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
diff --git a/src/Components/test/testassets/BasicTestApp/SvgCircleComponent.cshtml b/src/Components/test/testassets/BasicTestApp/SvgCircleComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/SvgCircleComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/SvgCircleComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/SvgComponent.cshtml b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/SvgComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/SvgComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.cshtml b/src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/TemplatedTable.cshtml b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/TemplatedTable.cshtml
rename to src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
diff --git a/src/Components/test/testassets/BasicTestApp/TextOnlyComponent.cshtml b/src/Components/test/testassets/BasicTestApp/TextOnlyComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/TextOnlyComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/TextOnlyComponent.razor
diff --git a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.cshtml b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
similarity index 100%
rename from src/Components/test/testassets/BasicTestApp/TouchEventComponent.cshtml
rename to src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/App.cshtml b/src/Components/test/testassets/ComponentsApp.App/App.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/App.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/App.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj
index 317f4b715a..3e79d4f6a1 100644
--- a/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj
+++ b/src/Components/test/testassets/ComponentsApp.App/ComponentsApp.App.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <!-- Reference targets and props from Components.Build package -->
-  <Import Project="..\..\..\Build\src\ReferenceFromSource.props" />
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Pages/Counter.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Index.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/Index.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Pages/Index.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Pages/Index.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/_ViewImports.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/_Imports.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Pages/_ViewImports.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Pages/_Imports.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.cshtml b/src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.cshtml b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
diff --git a/src/Components/test/testassets/ComponentsApp.App/_ViewImports.cshtml b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
similarity index 100%
rename from src/Components/test/testassets/ComponentsApp.App/_ViewImports.cshtml
rename to src/Components/test/testassets/ComponentsApp.App/_Imports.razor
diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj
index 19379ceb99..9822285d52 100644
--- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj
+++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj
@@ -2,13 +2,11 @@
 
   <PropertyGroup>
       <TargetFramework>netcoreapp3.0</TargetFramework>
+      <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.Server" />
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <ProjectReference Include="..\ComponentsApp.App\ComponentsApp.App.csproj" />
diff --git a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.cshtml b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
similarity index 100%
rename from src/Components/test/testassets/TestContentPackage/ComponentFromPackage.cshtml
rename to src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
diff --git a/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj b/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj
index 2048580e17..d92a0306a7 100644
--- a/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj
+++ b/src/Components/test/testassets/TestContentPackage/TestContentPackage.csproj
@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <!-- Reference targets and props from Components.Build package -->
-  <Import Project="..\..\..\Build\src\ReferenceFromSource.props" />
-
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>library</OutputType>
+    <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj
index df96819c67..2d6050a9b8 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj
+++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/ApiAuthSample.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E</UserSecretsId>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
index dfa2ae6525..d952b7700c 100644
--- a/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
+++ b/src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj
@@ -14,9 +14,7 @@
     <EnableDefaultRazorGenerateItems>false</EnableDefaultRazorGenerateItems>
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
 
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
index 849822f436..29d2a556c0 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
+++ b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj
@@ -4,6 +4,7 @@
     <Description>Identity sample MVC application on ASP.NET Core using the default UI</Description>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnetcore-2ff9bc27-5e8c-4484-90ca-e3aace89b72a</UserSecretsId>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
index b78dc55331..deeec618ca 100644
--- a/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
+++ b/src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
@@ -4,6 +4,7 @@
     <Description>Identity sample MVC application on ASP.NET Core</Description>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnetcore-b3d20cbe-418e-4bf2-a0f4-57f91d067e07</UserSecretsId>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
index e2ec0518f3..a1cd5bea86 100644
--- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
+++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D</UserSecretsId>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj b/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj
index d5bea12a23..92744abddc 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/NodeServicesExamples.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj
index 494b84a780..4113737efb 100644
--- a/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj
+++ b/src/Middleware/SpaServices/samples/Webpack/Webpack.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <IsPackable>false</IsPackable>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/MusicStore/samples/MusicStore/MusicStore.csproj b/src/MusicStore/samples/MusicStore/MusicStore.csproj
index 682cc74754..b4f96b0c78 100644
--- a/src/MusicStore/samples/MusicStore/MusicStore.csproj
+++ b/src/MusicStore/samples/MusicStore/MusicStore.csproj
@@ -8,6 +8,7 @@
     <DefineConstants>$(DefineConstants);DEMO</DefineConstants>
     <RuntimeIdentifiers>win-x86;win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <InProcessTestSite>true</InProcessTestSite>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
index 6cb22ad18a..37a3a2296d 100644
--- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
+++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
@@ -9,6 +9,7 @@
     <!-- Pomelo.EntityFrameworkCore.MySql is not strong named, so this test assembly cannot be strong-named signed either. -->
     <SignAssembly>false</SignAssembly>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
index 29819095ee..416e5087d1 100644
--- a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
+++ b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
@@ -3,6 +3,7 @@
     <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BenchmarksTargetFramework)' != ''">$(BenchmarksTargetFramework)</TargetFrameworks>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <!-- These references are used when running locally -->
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj
index ca14afc0b5..cdce92f5a8 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj
@@ -5,6 +5,7 @@
     <!--  Workaround https://github.com/dotnet/core-setup/issues/3726 -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <IsBenchmarkProject>true</IsBenchmarkProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/samples/MvcSandbox/Components/Pages/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Components/Pages/_ViewImports.cshtml
deleted file mode 100644
index 98b5832d4b..0000000000
--- a/src/Mvc/samples/MvcSandbox/Components/Pages/_ViewImports.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-@using MvcSandbox.Components.Shared
-@layout MainLayout
diff --git a/src/Mvc/samples/MvcSandbox/Components/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Components/_ViewImports.cshtml
deleted file mode 100644
index eb0ea6f502..0000000000
--- a/src/Mvc/samples/MvcSandbox/Components/_ViewImports.cshtml
+++ /dev/null
@@ -1 +0,0 @@
-@namespace MvcSandbox.Components
diff --git a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
index 697cdb83eb..6fe7c2591d 100644
--- a/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
+++ b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <_RazorComponentInclude>Components\**\*.cshtml</_RazorComponentInclude>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
index 63b09ef8fa..bb07f7faa4 100644
--- a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
+++ b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
index 89b48fe417..12f5d54167 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
+++ b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/RouterContainer.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/RouterContainer.razor
index ab5e66e9c2..604c777bf4 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/RouterContainer.razor
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/RouterContainer.razor
@@ -1,5 +1,6 @@
-Router component
+@using Microsoft.AspNetCore.Components.Routing
+Router component
 <Router 
         AppAssembly="System.Reflection.Assembly.GetAssembly(typeof(RouterContainer))"
         FallbackComponent="typeof(Fallback)">
-</Router>
\ No newline at end of file
+</Router>
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
index e409e9764b..14e10c8225 100644
--- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
index 7f98eb7afe..2d67a32c21 100644
--- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
@@ -5,6 +5,7 @@
     <!-- We want to validate runtime parser \ compilation exceptions -->
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
index e10c2e168b..a114481270 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
index 110ba0c8cc..8fb3530b46 100644
--- a/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
@@ -2,11 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <!--  Workaround https://github.com/dotnet/core-setup/issues/3726 -->
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-
-    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
index a7ccaf6ebf..90205ddb1c 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
index f6b24e30ec..8fee3a8a6b 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
+++ b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <DefineConstants>$(DefineConstants);NETCOREAPP2_0_CUSTOM_DEFINE</DefineConstants>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
index 145510e30e..2ebdca4f3c 100644
--- a/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
+++ b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
index 67d19453c6..15b5e378a4 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
+++ b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
index 4717009c54..13ab37d5df 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
index 3172968d9e..436c21eb41 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
+++ b/src/ProjectTemplates/Web.ProjectTemplates/Microsoft.DotNet.Web.ProjectTemplates.csproj
@@ -31,7 +31,6 @@
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Azure\AzureAD\Authentication.AzureADB2C.UI\src\Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Components\Browser\src\Microsoft.AspNetCore.Components.Browser.csproj" />
-    <PackageVersionVariableReference Include="$(RepositoryRoot)src\Components\Build\src\Microsoft.AspNetCore.Components.Build.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Identity\EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
     <PackageVersionVariableReference Include="$(RepositoryRoot)src\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj" />
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in
index 79270c3102..74aa7dab10 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorClassLibrary-CSharp.csproj.in
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework Condition="'$(SupportPagesAndViews)' == 'True'">netcoreapp3.0</TargetFramework>
     <TargetFramework Condition="'$(SupportPagesAndViews)' != 'True'">netstandard2.0</TargetFramework>
+    <RazorLangVersion Condition="'$(SupportPagesAndViews)' != 'True'">3.0</RazorLangVersion>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.RazorClassLibrary1</RootNamespace>
   </PropertyGroup>
 
@@ -11,7 +12,6 @@
   </ItemGroup>
   <ItemGroup Condition="'$(SupportPagesAndViews)' != 'True'">
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="${MicrosoftAspNetCoreComponentsPackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Build" Version="${MicrosoftAspNetCoreComponentsBuildPackageVersion}" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in
index 90f398d369..e1d4e827c4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorComponentsWeb-CSharp.csproj.in
@@ -5,7 +5,7 @@
     <LangVersion>7.3</LangVersion>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">RazorComponentsWeb_CSharp</RootNamespace>
-    <_RazorComponentInclude>Components\**\*.cshtml</_RazorComponentInclude>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
index 1b8a5103ff..c61a941a4a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/RazorPagesWeb-CSharp.csproj.in
@@ -7,6 +7,7 @@
     <WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <!--#if (IndividualLocalAuth && !UseLocalDB) -->
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
index c6fbbb7bf0..aea54d6fe8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.ProjectTemplates/StarterWeb-CSharp.csproj.in
@@ -7,6 +7,7 @@
     <WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <!--#if (IndividualLocalAuth && !UseLocalDB) -->
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
index 082a437cb8..ee5dd4c35b 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/Angular-CSharp.csproj.in
@@ -12,6 +12,7 @@
     <!-- Set this to true if you enable server-side prerendering -->
     <BuildServerSideRenderer>false</BuildServerSideRenderer>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in
index 5b930ebba1..a50d7e293c 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/React-CSharp.csproj.in
@@ -9,6 +9,7 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
index eee417f529..0fb4e21057 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/ReactRedux-CSharp.csproj.in
@@ -9,6 +9,7 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes>
     <NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj b/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj
index 356b19430d..0ae7fdb10c 100644
--- a/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj
+++ b/src/Security/samples/ClaimsTransformation/ClaimsTransformation.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/samples/Cookies/Cookies.csproj b/src/Security/samples/Cookies/Cookies.csproj
index 356b19430d..0ae7fdb10c 100644
--- a/src/Security/samples/Cookies/Cookies.csproj
+++ b/src/Security/samples/Cookies/Cookies.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj b/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj
index f0608927d2..22d5874a39 100644
--- a/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj
+++ b/src/Security/samples/CustomPolicyProvider/CustomPolicyProvider.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj b/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj
index d72d814671..7040a41b30 100644
--- a/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj
+++ b/src/Security/samples/DynamicSchemes/DynamicSchemes.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj
index fc5f7fded5..f9c2f1db80 100644
--- a/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj
+++ b/src/Security/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj
@@ -3,6 +3,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-Identity.ExternalClaims-E95BE154-CB1B-4633-A2E0-B2DF12FE8BD3</UserSecretsId>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore" />
diff --git a/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj b/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj
index 356b19430d..0ae7fdb10c 100644
--- a/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj
+++ b/src/Security/samples/PathSchemeSelection/PathSchemeSelection.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj b/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj
index 5061fcb022..2c291cdf04 100644
--- a/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj
+++ b/src/Security/samples/StaticFilesAuth/StaticFilesAuth.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-StaticFilesAuth-AFE2BD9D-1575-4C3E-BE32-3F15C5BC9947</UserSecretsId>
     <IsTestAssetProject>true</IsTestAssetProject>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
index 691e079474..5ed90db04a 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/AppOfflineTests.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
@@ -99,7 +100,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
         {
             // The goal of this test is to have multiple requests currently in progress
             // and for app offline to be dropped. We expect that all requests are eventually drained
-            // and graceful shutdown occurs. 
+            // and graceful shutdown occurs.
             var deploymentParameters = Fixture.GetBaseDeploymentParameters(Fixture.InProcessTestSite);
             deploymentParameters.TransformArguments((a, _) => $"{a} IncreaseShutdownLimit");
 
@@ -215,7 +216,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
         [ConditionalTheory]
         [InlineData(HostingModel.InProcess)]
         [InlineData(HostingModel.OutOfProcess)]
-        [Flaky("https://github.com/aspnet/AspNetCore/issues/7075")]
+        [Flaky("https://github.com/aspnet/AspNetCore/issues/7075", FlakyOn.All)]
         public async Task AppOfflineAddedAndRemovedStress(HostingModel hostingModel)
         {
             var deploymentResult = await AssertStarts(hostingModel);
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
index 7b82a3b519..fa2076633a 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/ConfigurationChangeTests.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
@@ -81,7 +82,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         [ConditionalTheory]
         [InlineData(HostingModel.InProcess)]
         [InlineData(HostingModel.OutOfProcess)]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1794")]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1794", FlakyOn.All)]
         public async Task ConfigurationTouchedStress(HostingModel hostingModel)
         {
             var deploymentResult = await DeployAsync(Fixture.GetBaseDeploymentParameters(hostingModel));
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
index 4bcc4bba53..20d2570072 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
@@ -12,6 +12,7 @@ using System.Xml.Linq;
 using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Server.IntegrationTesting.IIS;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Win32;
 using Xunit;
@@ -319,7 +320,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1772")]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1772", FlakyOn.All)]
         public async Task StartupTimeoutIsApplied()
         {
             // From what I can tell, this failure is due to ungraceful shutdown.
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
index 2d21fba2c6..e2cdf89986 100644
--- a/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
+++ b/src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
@@ -6,6 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Xunit;
@@ -51,7 +52,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1831")]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1831", FlakyOn.All)]
         public async Task WritesCancelledWhenUsingAbortedToken()
         {
             var requestStartedCompletionSource = CreateTaskCompletionSource();
@@ -174,7 +175,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1831")]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1831", FlakyOn.All)]
         public async Task ReaderThrowsCancelledException()
         {
             var requestStartedCompletionSource = CreateTaskCompletionSource();
@@ -220,7 +221,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         }
 
         [ConditionalFact]
-        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1817")]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1817", FlakyOn.All)]
         public async Task ReaderThrowsResetExceptionOnInvalidBody()
         {
             var requestStartedCompletionSource = CreateTaskCompletionSource();